From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751796AbbDLMTX (ORCPT ); Sun, 12 Apr 2015 08:19:23 -0400 Received: from mx-rz-3.rrze.uni-erlangen.de ([131.188.11.22]:43543 "EHLO mx-rz-3.rrze.uni-erlangen.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751408AbbDLMTV (ORCPT ); Sun, 12 Apr 2015 08:19:21 -0400 X-RRZE-Submit-IP: 131.188.42.17 From: Andreas Ruprecht To: Peter Jones Cc: Lv Zheng , Konrad Rzeszutek Wilk , linux-kernel@vger.kernel.org, Andreas Ruprecht Subject: [PATCH RESEND] firmware: iSCSI: Remove unneeded #ifdef and associated dead code Date: Sun, 12 Apr 2015 14:19:04 +0200 Message-Id: <1428841144-17331-1-git-send-email-andreas.ruprecht@fau.de> X-Mailer: git-send-email 1.9.1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org In commit 9d24622ced32 ("ACPI / IBFT: Fix incorrect 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 --- 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