* [lm-sensors] [PATCH] hwmon: (sch56xx-common) Fix build warnings
@ 2012-08-06 14:23 Guenter Roeck
2012-08-06 14:33 ` Hans de Goede
0 siblings, 1 reply; 2+ messages in thread
From: Guenter Roeck @ 2012-08-06 14:23 UTC (permalink / raw)
To: lm-sensors
Fix:
warning: 'address' may be used uninitialized in this function
warning: 'name' may be used uninitialized in this function
While those are false warnings, the patch reduces module size on x86_64 by
approximately 110 bytes, so it is still worth the effort.
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
---
drivers/hwmon/sch56xx-common.c | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/drivers/hwmon/sch56xx-common.c b/drivers/hwmon/sch56xx-common.c
index 4380f5d..69abbf7 100644
--- a/drivers/hwmon/sch56xx-common.c
+++ b/drivers/hwmon/sch56xx-common.c
@@ -503,10 +503,10 @@ EXPORT_SYMBOL(sch56xx_watchdog_unregister);
* platform dev find, add and remove functions
*/
-static int __init sch56xx_find(int sioaddr, unsigned short *address,
- const char **name)
+static int __init sch56xx_find(int sioaddr, const char **name)
{
u8 devid;
+ unsigned short address;
int err;
err = superio_enter(sioaddr);
@@ -540,13 +540,14 @@ static int __init sch56xx_find(int sioaddr, unsigned short *address,
* Warning the order of the low / high byte is the other way around
* as on most other superio devices!!
*/
- *address = superio_inb(sioaddr, SIO_REG_ADDR) |
+ address = superio_inb(sioaddr, SIO_REG_ADDR) |
superio_inb(sioaddr, SIO_REG_ADDR + 1) << 8;
- if (*address = 0) {
+ if (address = 0) {
pr_warn("Base address not set\n");
err = -ENODEV;
goto exit;
}
+ err = address;
exit:
superio_exit(sioaddr);
@@ -593,15 +594,14 @@ exit_device_put:
static int __init sch56xx_init(void)
{
- int err;
unsigned short address;
- const char *name;
+ const char *name = NULL;
- err = sch56xx_find(0x4e, &address, &name);
- if (err)
- err = sch56xx_find(0x2e, &address, &name);
- if (err)
- return err;
+ address = sch56xx_find(0x4e, &name);
+ if (address < 0)
+ address = sch56xx_find(0x2e, &name);
+ if (address < 0)
+ return address;
return sch56xx_device_add(address, name);
}
--
1.7.9.7
_______________________________________________
lm-sensors mailing list
lm-sensors@lm-sensors.org
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [lm-sensors] [PATCH] hwmon: (sch56xx-common) Fix build warnings
2012-08-06 14:23 [lm-sensors] [PATCH] hwmon: (sch56xx-common) Fix build warnings Guenter Roeck
@ 2012-08-06 14:33 ` Hans de Goede
0 siblings, 0 replies; 2+ messages in thread
From: Hans de Goede @ 2012-08-06 14:33 UTC (permalink / raw)
To: lm-sensors
Hi,
On 08/06/2012 04:23 PM, Guenter Roeck wrote:
> Fix:
> warning: 'address' may be used uninitialized in this function
> warning: 'name' may be used uninitialized in this function
>
> While those are false warnings, the patch reduces module size on x86_64 by
> approximately 110 bytes, so it is still worth the effort.
>
> Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Looks good:
Acked-by: Hans de Goede <hdegoede@redhat.com>
Regards,
Hans
> ---
> drivers/hwmon/sch56xx-common.c | 22 +++++++++++-----------
> 1 file changed, 11 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/hwmon/sch56xx-common.c b/drivers/hwmon/sch56xx-common.c
> index 4380f5d..69abbf7 100644
> --- a/drivers/hwmon/sch56xx-common.c
> +++ b/drivers/hwmon/sch56xx-common.c
> @@ -503,10 +503,10 @@ EXPORT_SYMBOL(sch56xx_watchdog_unregister);
> * platform dev find, add and remove functions
> */
>
> -static int __init sch56xx_find(int sioaddr, unsigned short *address,
> - const char **name)
> +static int __init sch56xx_find(int sioaddr, const char **name)
> {
> u8 devid;
> + unsigned short address;
> int err;
>
> err = superio_enter(sioaddr);
> @@ -540,13 +540,14 @@ static int __init sch56xx_find(int sioaddr, unsigned short *address,
> * Warning the order of the low / high byte is the other way around
> * as on most other superio devices!!
> */
> - *address = superio_inb(sioaddr, SIO_REG_ADDR) |
> + address = superio_inb(sioaddr, SIO_REG_ADDR) |
> superio_inb(sioaddr, SIO_REG_ADDR + 1) << 8;
> - if (*address = 0) {
> + if (address = 0) {
> pr_warn("Base address not set\n");
> err = -ENODEV;
> goto exit;
> }
> + err = address;
>
> exit:
> superio_exit(sioaddr);
> @@ -593,15 +594,14 @@ exit_device_put:
>
> static int __init sch56xx_init(void)
> {
> - int err;
> unsigned short address;
> - const char *name;
> + const char *name = NULL;
>
> - err = sch56xx_find(0x4e, &address, &name);
> - if (err)
> - err = sch56xx_find(0x2e, &address, &name);
> - if (err)
> - return err;
> + address = sch56xx_find(0x4e, &name);
> + if (address < 0)
> + address = sch56xx_find(0x2e, &name);
> + if (address < 0)
> + return address;
>
> return sch56xx_device_add(address, name);
> }
>
_______________________________________________
lm-sensors mailing list
lm-sensors@lm-sensors.org
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-08-06 14:33 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-08-06 14:23 [lm-sensors] [PATCH] hwmon: (sch56xx-common) Fix build warnings Guenter Roeck
2012-08-06 14:33 ` Hans de Goede
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.