hwmon: (sch56xx-common) Fix build warnings
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> Acked-by: Hans de Goede <hdegoede@redhat.com>hifive-unleashed-5.1
parent
0038389add
commit
313829ee3c
|
@ -503,10 +503,10 @@ EXPORT_SYMBOL(sch56xx_watchdog_unregister);
|
||||||
* platform dev find, add and remove functions
|
* platform dev find, add and remove functions
|
||||||
*/
|
*/
|
||||||
|
|
||||||
static int __init sch56xx_find(int sioaddr, unsigned short *address,
|
static int __init sch56xx_find(int sioaddr, const char **name)
|
||||||
const char **name)
|
|
||||||
{
|
{
|
||||||
u8 devid;
|
u8 devid;
|
||||||
|
unsigned short address;
|
||||||
int err;
|
int err;
|
||||||
|
|
||||||
err = superio_enter(sioaddr);
|
err = superio_enter(sioaddr);
|
||||||
|
@ -540,20 +540,21 @@ static int __init sch56xx_find(int sioaddr, unsigned short *address,
|
||||||
* Warning the order of the low / high byte is the other way around
|
* Warning the order of the low / high byte is the other way around
|
||||||
* as on most other superio devices!!
|
* 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;
|
superio_inb(sioaddr, SIO_REG_ADDR + 1) << 8;
|
||||||
if (*address == 0) {
|
if (address == 0) {
|
||||||
pr_warn("Base address not set\n");
|
pr_warn("Base address not set\n");
|
||||||
err = -ENODEV;
|
err = -ENODEV;
|
||||||
goto exit;
|
goto exit;
|
||||||
}
|
}
|
||||||
|
err = address;
|
||||||
|
|
||||||
exit:
|
exit:
|
||||||
superio_exit(sioaddr);
|
superio_exit(sioaddr);
|
||||||
return err;
|
return err;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int __init sch56xx_device_add(unsigned short address, const char *name)
|
static int __init sch56xx_device_add(int address, const char *name)
|
||||||
{
|
{
|
||||||
struct resource res = {
|
struct resource res = {
|
||||||
.start = address,
|
.start = address,
|
||||||
|
@ -593,15 +594,14 @@ exit_device_put:
|
||||||
|
|
||||||
static int __init sch56xx_init(void)
|
static int __init sch56xx_init(void)
|
||||||
{
|
{
|
||||||
int err;
|
int address;
|
||||||
unsigned short address;
|
const char *name = NULL;
|
||||||
const char *name;
|
|
||||||
|
|
||||||
err = sch56xx_find(0x4e, &address, &name);
|
address = sch56xx_find(0x4e, &name);
|
||||||
if (err)
|
if (address < 0)
|
||||||
err = sch56xx_find(0x2e, &address, &name);
|
address = sch56xx_find(0x2e, &name);
|
||||||
if (err)
|
if (address < 0)
|
||||||
return err;
|
return address;
|
||||||
|
|
||||||
return sch56xx_device_add(address, name);
|
return sch56xx_device_add(address, name);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue