aboutsummaryrefslogtreecommitdiff
path: root/drivers/watchdog/hpwdt.c
diff options
context:
space:
mode:
authorRoland Dreier <rdreier@cisco.com>2008-02-28 09:48:10 -0800
committerWim Van Sebroeck <wim@iguana.be>2008-03-06 11:10:44 +0000
commitef82710a3f80cd24d459c508f91542ecccb1f340 (patch)
tree11c1454eb39f0f82378f179bb15f43b992093613 /drivers/watchdog/hpwdt.c
parent103018aca2e4ba0d0e230efa864231c59228f419 (diff)
[WATCHDOG] Fix return value warning in hpwdt
The return value of smbios_scan_machine() is never used, and when it succeeds it doesn't return anything, so just make it void. This fixes: drivers/watchdog/hpwdt.c: In function 'smbios_scan_machine': drivers/watchdog/hpwdt.c:562: warning: control reaches end of non-void function Signed-off-by: Roland Dreier <rolandd@cisco.com> Acked-by: Thomas Mingarelli <Thomas.Mingarelli@hp.com> Signed-off-by: Wim Van Sebroeck <wim@iguana.be> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Diffstat (limited to 'drivers/watchdog/hpwdt.c')
-rw-r--r--drivers/watchdog/hpwdt.c19
1 files changed, 8 insertions, 11 deletions
diff --git a/drivers/watchdog/hpwdt.c b/drivers/watchdog/hpwdt.c
index cd1cc2dacee..b1cd0aca9b3 100644
--- a/drivers/watchdog/hpwdt.c
+++ b/drivers/watchdog/hpwdt.c
@@ -528,20 +528,19 @@ static int __devinit smbios_present(const char __iomem *p)
return -ENODEV;
}
-static int __devinit smbios_scan_machine(void)
+static void __devinit smbios_scan_machine(void)
{
char __iomem *p, *q;
- int rc;
if (efi_enabled) {
if (efi.smbios == EFI_INVALID_TABLE_ADDR)
- return -ENODEV;
+ return;
p = ioremap(efi.smbios, 32);
if (p == NULL)
- return -ENOMEM;
+ return;
- rc = smbios_present(p);
+ smbios_present(p);
iounmap(p);
} else {
/*
@@ -549,14 +548,12 @@ static int __devinit smbios_scan_machine(void)
*/
p = ioremap(PCI_ROM_BASE1, ROM_SIZE);
if (p == NULL)
- return -ENOMEM;
+ return;
- for (q = p; q < p + ROM_SIZE; q += 16) {
- rc = smbios_present(q);
- if (!rc) {
+ for (q = p; q < p + ROM_SIZE; q += 16)
+ if (!smbios_present(q))
break;
- }
- }
+
iounmap(p);
}
}