The patch titled watchdog: hpwdt: fix return value warning has been removed from the -mm tree. Its filename was watchdog-hpwdt-fix-return-value-warning.patch This patch was dropped because it was merged into mainline or a subsystem tree The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: watchdog: hpwdt: fix return value warning From: Roland Dreier <rdreier@xxxxxxxxx> 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@xxxxxxxxx> Acked-by: Thomas Mingarelli <Thomas.Mingarelli@xxxxxx> Cc: Wim Van Sebroeck <wim@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/watchdog/hpwdt.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff -puN drivers/watchdog/hpwdt.c~watchdog-hpwdt-fix-return-value-warning drivers/watchdog/hpwdt.c --- a/drivers/watchdog/hpwdt.c~watchdog-hpwdt-fix-return-value-warning +++ a/drivers/watchdog/hpwdt.c @@ -528,20 +528,19 @@ static int __devinit smbios_present(cons 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 */ 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); } } _ Patches currently in -mm which might be from rdreier@xxxxxxxxx are input-i8042-fix-warning-on-non-x86-builds.patch git-watchdog.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html