1 files changed, 8 insertions, 11 deletions

diff --git a/drivers/watchdog/hpwdt.c b/drivers/watchdog/hpwdt.c
index cd1cc2dacee7..b1cd0aca9b3c 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);
         }
 }