* [PATCH] firmware: iSCSI: Remove unneeded #ifdef and associated dead code
[not found] <1428421339-19722-1-git-send-email-andreas.ruprecht@fau.de>
@ 2015-04-07 16:10 ` Andreas Ruprecht
0 siblings, 0 replies; only message in thread
From: Andreas Ruprecht @ 2015-04-07 16:10 UTC (permalink / raw)
To: linux-kernel; +Cc: Stefan Hengelein
In commit 9d24622ced32 ("ACPI / IBFT: Fix incorrect <acpi/acpi.h>
inclusion in iSCSI boot firmware module"), the dependencies for
CONFIG_ISCSI_IBFT_FIND were changed to also include CONFIG_ACPI.
Inside drivers/firmware/iscsi_ibft.c, there is an "#ifdef CONFIG_ACPI"
block, while the whole file is only compiled with CONFIG_ISCSI_IBFT
enabled. As CONFIG_ISCSI_IBFT depends on CONFIG_ISCSI_IBFT_FIND
(which in turn depends on CONFIG_ACPI), CONFIG_ACPI will always be
enabled when we compile the file, hence the #ifdef is unnecessary and
the (empty) function inside the #else block can never be compiled and
they can both be removed.
Signed-off-by: Andreas Ruprecht <andreas.ruprecht@fau.de>
---
This inconsistency was found using the undertaker-checkpatch tool
which is included in the undertaker toolchain.
drivers/firmware/iscsi_ibft.c | 6 ------
1 file changed, 6 deletions(-)
diff --git a/drivers/firmware/iscsi_ibft.c b/drivers/firmware/iscsi_ibft.c
index 071c2c9..60c937f 100644
--- a/drivers/firmware/iscsi_ibft.c
+++ b/drivers/firmware/iscsi_ibft.c
@@ -746,7 +746,6 @@ static void __exit ibft_exit(void)
ibft_cleanup();
}
-#ifdef CONFIG_ACPI
static const struct {
char *sign;
} ibft_signs[] = {
@@ -772,11 +771,6 @@ static void __init acpi_find_ibft_region(void)
ibft_addr = (struct acpi_table_ibft *)table;
}
}
-#else
-static void __init acpi_find_ibft_region(void)
-{
-}
-#endif
/*
* ibft_init() - creates sysfs tree entries for the iBFT data.
--
1.9.1
^ permalink raw reply related [flat|nested] only message in thread