Fixups for issues when running 'make randconfig'

This the at91sam9g45_isi_device structure and its associated resources were added in 2008 and have been unused ever since. Let's remove them.

Cc Russell King <[email protected]>

Cc linux-arm-kernel at lists.infradead.org

Signed-off-by Lee Jones <[email protected]>

---
 arch/arm/mach-at91/at91sam9263_devices.c |   20 --------------------
 1 file changed, 20 deletions(-)

arch/arm/mach-at91/at91sam9263_devices.c +0 -20

index cb85da2..0562a9d 100644
@@ -901,26 +901,6 @@ void __init at91_add_device_lcdc(struct atmel_lcdfb_info *data) {}
 
 #if defined(CONFIG_VIDEO_AT91_ISI) || defined(CONFIG_VIDEO_AT91_ISI_MODULE)
 
-struct resource isi_resources[] = {
-	[0] = {
-		.start	= AT91SAM9263_BASE_ISI,
-		.end	= AT91SAM9263_BASE_ISI + SZ_16K - 1,
-		.flags	= IORESOURCE_MEM,
-	},
-	[1] = {
-		.start	= NR_IRQS_LEGACY + AT91SAM9263_ID_ISI,
-		.end	= NR_IRQS_LEGACY + AT91SAM9263_ID_ISI,
-		.flags	= IORESOURCE_IRQ,
-	},
-};
-
-static struct platform_device at91sam9263_isi_device = {
-	.name		= "at91_isi",
-	.id		= -1,
-	.resource	= isi_resources,
-	.num_resources	= ARRAY_SIZE(isi_resources),
-};
-
 void __init at91_add_device_isi(struct isi_platform_data *data,
 		bool use_pck_as_mck)
 {

Signature · 7 lines

1.7.9.5


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel at lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Quoted 2 lines · Lee Jones

This the at91sam9g45_isi_device structure and its associated resources were added in 2008 and have been unused ever since. Let's remove them.

next time you need to Cc the matinaers

NACK

Quoted 46 lines

Cc Russell King <[email protected]>

Cc linux-arm-kernel at lists.infradead.org

Signed-off-by Lee Jones <[email protected]>

---
 arch/arm/mach-at91/at91sam9263_devices.c |   20 --------------------
 1 file changed, 20 deletions(-)

arch/arm/mach-at91/at91sam9263_devices.c +0 -20

index cb85da2..0562a9d 100644
@@ -901,26 +901,6 @@ void __init at91_add_device_lcdc(struct atmel_lcdfb_info *data) {}
 
 #if defined(CONFIG_VIDEO_AT91_ISI) || defined(CONFIG_VIDEO_AT91_ISI_MODULE)
 
-struct resource isi_resources[] = {
-	[0] = {
-		.start	= AT91SAM9263_BASE_ISI,
-		.end	= AT91SAM9263_BASE_ISI + SZ_16K - 1,
-		.flags	= IORESOURCE_MEM,
-	},
-	[1] = {
-		.start	= NR_IRQS_LEGACY + AT91SAM9263_ID_ISI,
-		.end	= NR_IRQS_LEGACY + AT91SAM9263_ID_ISI,
-		.flags	= IORESOURCE_IRQ,
-	},
-};
-
-static struct platform_device at91sam9263_isi_device = {
-	.name		= "at91_isi",
-	.id		= -1,
-	.resource	= isi_resources,
-	.num_resources	= ARRAY_SIZE(isi_resources),
-};
-
 void __init at91_add_device_isi(struct isi_platform_data *data,
 		bool use_pck_as_mck)
 {

Signature · 7 lines

1.7.9.5


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel at lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

This the at91sam9g45_isi_device structure and its associated resources were added in 2008 and have been unused ever since. Let's remove them.

Cc Russell King <[email protected]>

Cc linux-arm-kernel at lists.infradead.org

Signed-off-by Lee Jones <[email protected]>

---
  arch/arm/mach-at91/at91sam9263_devices.c |   20 --------------------
  1 file changed, 20 deletions(-)

arch/arm/mach-at91/at91sam9263_devices.c +0 -20

index cb85da2..0562a9d 100644
@@ -901,26 +901,6 @@ void __init at91_add_device_lcdc(struct atmel_lcdfb_info *data) {}
 
  #if defined(CONFIG_VIDEO_AT91_ISI) || defined(CONFIG_VIDEO_AT91_ISI_MODULE)
 
-struct resource isi_resources[] = {
-	[0] = {
-		.start	= AT91SAM9263_BASE_ISI,
-		.end	= AT91SAM9263_BASE_ISI + SZ_16K - 1,
-		.flags	= IORESOURCE_MEM,
-	},
-	[1] = {
-		.start	= NR_IRQS_LEGACY + AT91SAM9263_ID_ISI,
-		.end	= NR_IRQS_LEGACY + AT91SAM9263_ID_ISI,
-		.flags	= IORESOURCE_IRQ,
-	},
-};
-
-static struct platform_device at91sam9263_isi_device = {
-	.name		= "at91_isi",
-	.id		= -1,
-	.resource	= isi_resources,
-	.num_resources	= ARRAY_SIZE(isi_resources),
-};
-
  void __init at91_add_device_isi(struct isi_platform_data *data,
  		bool use_pck_as_mck)
  {

Quoted 2 lines

This the at91sam9g45_isi_device structure and its associated resources were added in 2008 and have been unused ever since. Let's remove them.

I'm the maintainer of the Atmel ISI driver. Currently the ISI still not work on at91sam9263 board.
But this task is in my plan. So keep those code and I will enable ISI support for 9263 in the future. Thanks.

Quoted 36 lines

Cc Russell King <[email protected]>

Cc linux-arm-kernel at lists.infradead.org

Signed-off-by Lee Jones <[email protected]>

---
 arch/arm/mach-at91/at91sam9263_devices.c |   20 --------------------
 1 file changed, 20 deletions(-)

arch/arm/mach-at91/at91sam9263_devices.c +0 -20

index cb85da2..0562a9d 100644
@@ -901,26 +901,6 @@ void __init at91_add_device_lcdc(struct atmel_lcdfb_info *data) {}
 #if defined(CONFIG_VIDEO_AT91_ISI) || defined(CONFIG_VIDEO_AT91_ISI_MODULE)
-struct resource isi_resources[] = {
-	[0] = {
-		.start	= AT91SAM9263_BASE_ISI,
-		.end	= AT91SAM9263_BASE_ISI + SZ_16K - 1,
-		.flags	= IORESOURCE_MEM,
-	},
-	[1] = {
-		.start	= NR_IRQS_LEGACY + AT91SAM9263_ID_ISI,
-		.end	= NR_IRQS_LEGACY + AT91SAM9263_ID_ISI,
-		.flags	= IORESOURCE_IRQ,
-	},
-};
-
-static struct platform_device at91sam9263_isi_device = {
-	.name		= "at91_isi",
-	.id		= -1,
-	.resource	= isi_resources,
-	.num_resources	= ARRAY_SIZE(isi_resources),
-};
-
 void __init at91_add_device_isi(struct isi_platform_data *data,
 		bool use_pck_as_mck)
 {

If !CONFIG_SPI and !CONFIG_I2C* then there is no point adding support for the adav80x codec as it relies on a bus to operate. This patch fixes the build warnings below when SPI and I2C are not specified in the configuration.

sound/soc/codecs/adav80x.c:842:22: warning: ‘adav80x_bus_probe’ defined but not used [-Wunused-function] sound/soc/codecs/adav80x.c:863:22: warning: ‘adav80x_bus_remove’ defined but not used [-Wunused-function]

Cc Mark Brown <[email protected]>

Cc [email protected]

Signed-off-by Lee Jones <[email protected]>

---
 sound/soc/codecs/Kconfig |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

sound/soc/codecs/Kconfig +0 -0

index b92759a..0d8135a 100644

sound/soc/codecs/Kconfig +0 -0

 	select SND_SOC_ADS117X
 	select SND_SOC_AK4104 if SPI_MASTER
 	select SND_SOC_AK4535 if I2C

drivers/virtio/virtio_mmio.c: In function ‘vm_cmdline_set’:
drivers/virtio/virtio_mmio.c:535:4: warning: format ‘%u’ expects argument of type ‘unsigned int *’, but argument 4 has type ‘resource_size_t *’ [-Wformat]

Cc Rusty Russell <[email protected]>

Cc [email protected]

Signed-off-by Lee Jones <[email protected]>

---
 drivers/virtio/virtio_mmio.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

drivers/virtio/virtio_mmio.c +0 -0

index 6b1b7e1..077e9ca 100644

Quoted 15 lines · Lee Jones

drivers/virtio/virtio_mmio.c: In function ‘vm_cmdline_set’:
drivers/virtio/virtio_mmio.c:535:4: warning: format ‘%u’ expects argument of type ‘unsigned int *’, but argument 4 has type ‘resource_size_t *’ [-Wformat]

Cc Rusty Russell <[email protected]>

Cc [email protected]

Signed-off-by Lee Jones <[email protected]>

---
 drivers/virtio/virtio_mmio.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

drivers/virtio/virtio_mmio.c +0 -0

index 6b1b7e1..077e9ca 100644

drivers/virtio/virtio_mmio.c static int vm_cmdline_set(const char *device, · line 535

Quoted 6 lines

drivers/virtio/virtio_mmio.c +1 -1

@@ -531,7 +531,7 @@ static int vm_cmdline_set(const char *device,
 	resources[0].end = memparse(device, &str) - 1;
 
 	processed = sscanf(str, "@%lli:%u%n:%d%n",
-			&base, &resources[1].start, &consumed,
+			&base, (unsigned int *)&resources[1].start, &consumed,
 			&vm_cmdline_id, &consumed);

This suppresses a valid warning, leaving our code no less wrong than before. But now it's silently wrong!

Do you want to try again?

Quoted 8 lines

drivers/virtio/virtio_mmio.c static int vm_cmdline_set(const char *device, · line 535

Quoted 4 lines

drivers/virtio/virtio_mmio.c +1 -1

 	processed = sscanf(str, "@%lli:%u%n:%d%n",
-			&base, &resources[1].start, &consumed,
+			&base, (unsigned int *)&resources[1].start, &consumed,
 			&vm_cmdline_id, &consumed);

This suppresses a valid warning, leaving our code no less wrong than before. But now it's silently wrong!

Quoted 1 line

Do you want to try again?

For sure I'll try again.

How does s/%u/%p/ suit?

On 64-bit machines resource_size_t is a 64-bit value, while sscanf() format for this argument was defined as "%u". Fixed by using an intermediate local value of a known length.

Also added cleaned up the resource creation and adde extra comments to make the parameters parsing easier to follow.

Reported-by Lee Jones <[email protected]>

Signed-off-by Pawel Moll <[email protected]>

---
 drivers/virtio/virtio_mmio.c |   26 ++++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

Quoted 7 lines · Pawel Moll

On 64-bit machines resource_size_t is a 64-bit value, while sscanf() format for this argument was defined as "%u". Fixed by using an intermediate local value of a known length.

Also added cleaned up the resource creation and adde extra comments to make the parameters parsing easier to follow.

Quoted 5 lines

Reported-by Lee Jones <[email protected]>

Signed-off-by Pawel Moll <[email protected]>

---
 drivers/virtio/virtio_mmio.c |   26 ++++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

Resorted to poaching now have we Pawel? ;)

Quoted 15 lines · Lee Jones

Quoted 12 lines · Pawel Moll

On 64-bit machines resource_size_t is a 64-bit value, while sscanf() format for this argument was defined as "%u". Fixed by using an intermediate local value of a known length.

Also added cleaned up the resource creation and adde extra comments to make the parameters parsing easier to follow.

Reported-by Lee Jones <[email protected]>

Signed-off-by Pawel Moll <[email protected]>

---
 drivers/virtio/virtio_mmio.c |   26 ++++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

Quoted 1 line

Resorted to poaching now have we Pawel? ;)

Sure thing - the poached eggs are my firm favourite :-P ;-)

But seriously speaking - it's an old patch (all the comments and resources creation, the IRQ stuff is a new thing :-), but never had enough motivation to push it out...

Quoted 7 lines · Pawel Moll

On 64-bit machines resource_size_t is a 64-bit value, while sscanf() format for this argument was defined as "%u". Fixed by using an intermediate local value of a known length.

Also added cleaned up the resource creation and adde extra comments to make the parameters parsing easier to follow.

Quoted 5 lines

Reported-by Lee Jones <[email protected]>

Signed-off-by Pawel Moll <[email protected]>

---
 drivers/virtio/virtio_mmio.c |   26 ++++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

Resorted to poaching now have we Pawel? ;)

Quoted 1 line

Resorted to poaching now have we Pawel?

I hope you were joking!

Doing your work for you isn't poaching.

Quoted 3 lines

Quoted 1 line

Resorted to poaching now have we Pawel?

I hope you were joking!

Yes, of course. I thought that was clearly indicated by the jovial winking smiley. :)

I realise it wasn't obvious soley by this exchange, but Pawel and I are actually ol' friends.

Quoted 1 line

Doing your work for you isn't poaching.

This isn't related to my work, as I have no professional interest in virtio. In this particular instance I was trying to help out by fixing bugs uncovered by the use of randconfig, which I'm doing in my own time, as a hobby. I guess the use my work address clouds this fact, so I apologise for that.

Sorry for any confusion or offence caused though Rusty. :)

Kind regards,
Lee

On 64-bit machines resource_size_t is a 64-bit value, while sscanf() format for this argument was defined as "%u". Fixed by using an intermediate local value of a known length.

When the resource_size_t is 64-bit long, the sscanf() on the virtio device command line paramter string may return wrong value because its format was defined as "%u". Fixed by using an intermediate local value of a known length.

Also added cleaned up the resource creation and added extra comments to make the parameters parsing easier to follow.

quotactl_cmd_write() is only ever invoked when BLOCK is configured. When !CONFIG_BLOCK, the build warning below is displayed. Let's fix that.

fs/quota/quota.c:311:12: warning: ‘quotactl_cmd_write’ defined but not used [-Wunused-function]

Cc Jan Kara <[email protected]>

Signed-off-by Lee Jones <[email protected]>

---
 fs/quota/quota.c |    4 ++++
 1 file changed, 4 insertions(+)

fs/quota/quota.c +4 -0

index af1661f..c7314f1 100644
@@ -307,6 +307,8 @@ static int do_quotactl(struct super_block *sb, int type, int cmd, qid_t id,
 	}
 }
 
+#ifdef CONFIG_BLOCK
+
 /* Return 1 if 'cmd' will block on frozen filesystem */
 static int quotactl_cmd_write(int cmd)
 {

@@ -322,6 +324,8 @@ static int quotactl_cmd_write(int cmd)
 	return 1;
 }
 
+#endif /* CONFIG_BLOCK */
+
 /*
  * look up a superblock on which quota ops will be performed
  * - use the name of a block device to find the superblock thereon

Signature · 1 line

1.7.9.5

This patch fixes:
drivers/isdn/i4l/isdn_common.c: In function ‘isdn_ioctl’:
drivers/isdn/i4l/isdn_common.c:1278:8: warning: unused variable ‘s’ [-Wunused-variable]

Quoted 3 lines · Lee Jones

This patch fixes:
drivers/isdn/i4l/isdn_common.c: In function ‘isdn_ioctl’:
drivers/isdn/i4l/isdn_common.c:1278:8: warning: unused variable ‘s’ [-Wunused-variable]

Did you have CONFIG_NETDEVICES not set in this build?

Quoted 6 lines · Paul Bolle

Quoted 3 lines · Lee Jones

This patch fixes:
drivers/isdn/i4l/isdn_common.c: In function ‘isdn_ioctl’:
drivers/isdn/i4l/isdn_common.c:1278:8: warning: unused variable ‘s’ [-Wunused-variable]

Did you have CONFIG_NETDEVICES not set in this build?

Ah yes, I see it. The function went down further than I thought it did. So the real fix is to ensure 's' is defined inside of some ifdef CONFIG_NETDEVICES guards.

Quoted 11 lines · Lee Jones

Quoted 6 lines · Paul Bolle

Quoted 3 lines · Lee Jones

This patch fixes:
drivers/isdn/i4l/isdn_common.c: In function ‘isdn_ioctl’:
drivers/isdn/i4l/isdn_common.c:1278:8: warning: unused variable ‘s’ [-Wunused-variable]

Did you have CONFIG_NETDEVICES not set in this build?

Ah yes, I see it. The function went down further than I thought it did. So the real fix is to ensure 's' is defined inside of some ifdef CONFIG_NETDEVICES guards.

What puzzles me is that we only find these "#ifdef CONFIG_NETDEVICES" guards in this file and not in isdn_net.c, were all the ioctl commands guarded that way seem to be calling into. On first glance that doesn't make much sense.

(Actually the idea of having ISDN without NETDEVICES is a bit puzzling too. But there are too many parts of the isdn subsystem that I'm unfamiliar with to say whether that can make sense.)

Quoted 19 lines · Lee Jones

Quoted 11 lines · Paul Bolle

Quoted 6 lines · Lee Jones

Quoted 3 lines

This patch fixes:
drivers/isdn/i4l/isdn_common.c: In function ‘isdn_ioctl’:
drivers/isdn/i4l/isdn_common.c:1278:8: warning: unused variable ‘s’ [-Wunused-variable]

Did you have CONFIG_NETDEVICES not set in this build?

Ah yes, I see it. The function went down further than I thought it did. So the real fix is to ensure 's' is defined inside of some ifdef CONFIG_NETDEVICES guards.

What puzzles me is that we only find these "#ifdef CONFIG_NETDEVICES" guards in this file and not in isdn_net.c, were all the ioctl commands guarded that way seem to be calling into. On first glance that doesn't make much sense.

Quoted 3 lines

(Actually the idea of having ISDN without NETDEVICES is a bit puzzling too. But there are too many parts of the isdn subsystem that I'm unfamiliar with to say whether that can make sense.)

I'm in the same position as you Paul. I just noticed the warning so fixed it following the current way of doing things. Any, more substantial changes requiring greater knowledge of the subsystem would have to be done by someone else.

From: Lee Jones <[email protected]>
Date: Sun, 4 Nov 2012 11:53:32 +0100

Quoted 24 lines · Paul Bolle

Quoted 22 lines · Lee Jones

Quoted 11 lines · Paul Bolle

Quoted 6 lines · Lee Jones

Quoted 3 lines

This patch fixes:
drivers/isdn/i4l/isdn_common.c: In function ‘isdn_ioctl’:
drivers/isdn/i4l/isdn_common.c:1278:8: warning: unused variable ‘s’ [-Wunused-variable]

Did you have CONFIG_NETDEVICES not set in this build?

Ah yes, I see it. The function went down further than I thought it did. So the real fix is to ensure 's' is defined inside of some ifdef CONFIG_NETDEVICES guards.

What puzzles me is that we only find these "#ifdef CONFIG_NETDEVICES" guards in this file and not in isdn_net.c, were all the ioctl commands guarded that way seem to be calling into. On first glance that doesn't make much sense.

(Actually the idea of having ISDN without NETDEVICES is a bit puzzling too. But there are too many parts of the isdn subsystem that I'm unfamiliar with to say whether that can make sense.)

Quoted 4 lines

I'm in the same position as you Paul. I just noticed the warning so fixed it following the current way of doing things. Any, more substantial changes requiring greater knowledge of the subsystem would have to be done by someone else.

I think the most appropriate thing to do is make CONFIG_ISDN depend upon CONFIG_NETDEVICES in the Kconfig file.

Quoted 2 lines · David Miller

I think the most appropriate thing to do is make CONFIG_ISDN depend upon CONFIG_NETDEVICES in the Kconfig file.

... and then remove the CONFIG_NETDEVICES guards in isdn_common.c?

Quoted 5 lines · Lee Jones

Quoted 2 lines · David Miller

I think the most appropriate thing to do is make CONFIG_ISDN depend upon CONFIG_NETDEVICES in the Kconfig file.

... and then remove the CONFIG_NETDEVICES guards in isdn_common.c?

If ISDN would depend on NETDEVICES, ISDN_I4L would too, since it depends on ISDN. In that case CONFIG_NETDEVICES would always be true when compiling isdn_common.c. That would make these guards pointless. (The dependency of ISDN_PPP on NETDEVICES would then also be pointless.)

Quoted 33 lines

From: Lee Jones <[email protected]>
Date: Sun, 4 Nov 2012 11:53:32 +0100

Quoted 28 lines · Paul Bolle

Quoted 14 lines · Lee Jones

Quoted 11 lines · Paul Bolle

Quoted 6 lines · Lee Jones

Quoted 3 lines

This patch fixes:
drivers/isdn/i4l/isdn_common.c: In function ‘isdn_ioctl’:
drivers/isdn/i4l/isdn_common.c:1278:8: warning: unused variable ‘s’ [-Wunused-variable]

Did you have CONFIG_NETDEVICES not set in this build?

Ah yes, I see it. The function went down further than I thought it did. So the real fix is to ensure 's' is defined inside of some ifdef CONFIG_NETDEVICES guards.

Quoted 8 lines

What puzzles me is that we only find these "#ifdef CONFIG_NETDEVICES" guards in this file and not in isdn_net.c, were all the ioctl commands guarded that way seem to be calling into. On first glance that doesn't make much sense.

(Actually the idea of having ISDN without NETDEVICES is a bit puzzling too. But there are too many parts of the isdn subsystem that I'm unfamiliar with to say whether that can make sense.)

I'm in the same position as you Paul. I just noticed the warning so fixed it following the current way of doing things. Any, more substantial changes requiring greater knowledge of the subsystem would have to be done by someone else.

Quoted 2 lines

I think the most appropriate thing to do is make CONFIG_ISDN depend upon CONFIG_NETDEVICES in the Kconfig file.

... and then remove the CONFIG_NETDEVICES guards in isdn_common.c?

If that's suitable more suitable I can do that instead?

Just need a yay or nay and I'll make it happen.

Does something like look like a better solution?

Author: Lee Jones <[email protected]>
Date:   Sat Nov 3 22:06:02 2012 +0100

isdn: Make CONFIG_ISDN depend on CONFIG_NETDEVICES

From: Lee Jones <[email protected]>
Date: Mon, 5 Nov 2012 11:31:26 +0100

Quoted 6 lines

Does something like look like a better solution?

Author: Lee Jones <[email protected]>
Date:   Sat Nov 3 22:06:02 2012 +0100

isdn: Make CONFIG_ISDN depend on CONFIG_NETDEVICES

Yes, it looks good, please resubmit it formally.

Instead of issuing (0) statements when !CONFIG_SYSFS which will cause 'warning: ', we'll use inline statements instead. This will effectively do the same thing, but suppress any unnecessary warnings.

Cc Stephen Hemminger <[email protected]>

Cc [email protected]

Cc [email protected]

Signed-off-by Lee Jones <[email protected]>

From: Lee Jones <[email protected]>
Date: Sat, 3 Nov 2012 23:02:30 +0100

Quoted 8 lines

Instead of issuing (0) statements when !CONFIG_SYSFS which will cause 'warning: ', we'll use inline statements instead. This will effectively do the same thing, but suppress any unnecessary warnings.

Cc Stephen Hemminger <[email protected]>

Cc [email protected]

Cc [email protected]

Signed-off-by Lee Jones <[email protected]>

Applied, but please use more informative subject lines.

You should prefix your subject line after [PATCH ...] with the name of the subsystem you are touching, a ": " then the headline description.

So here you would have used "bridge: " and that's what I added when I commited this patch.