Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1423063AbbEEMz3 (ORCPT ); Tue, 5 May 2015 08:55:29 -0400 Received: from opensource.wolfsonmicro.com ([80.75.67.52]:44320 "EHLO opensource.wolfsonmicro.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758710AbbEEMvC (ORCPT ); Tue, 5 May 2015 08:51:02 -0400 From: Richard Fitzgerald To: lee.jones@linaro.org Cc: linux-kernel@vger.kernel.org, patches@opensource.wolfsonmicro.com, pebolle@tiscali.nl Subject: [PATCH] mfd: arizona: Fix incorrect Makefile conditionals Date: Tue, 5 May 2015 13:50:01 +0100 Message-Id: <1430830201-18952-1-git-send-email-rf@opensource.wolfsonmicro.com> X-Mailer: git-send-email 1.7.2.5 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2231 Lines: 63 The use of ifneq against 'n' to conditionally compile codec-specific parts is wrong and was resulting in all the codec tables being built even for deselected codecs. For the WM5102 there is an extra dependency on wm5102_patch() so it is given an alternative empty version when deselected to avoid having to sprinkle #ifdefs around the code. Signed-off-by: Richard Fitzgerald --- drivers/mfd/Makefile | 6 +++--- include/linux/mfd/arizona/core.h | 8 ++++++++ 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile index ca6d184..63743a7 100644 --- a/drivers/mfd/Makefile +++ b/drivers/mfd/Makefile @@ -41,13 +41,13 @@ obj-$(CONFIG_MFD_ARIZONA) += arizona-core.o obj-$(CONFIG_MFD_ARIZONA) += arizona-irq.o obj-$(CONFIG_MFD_ARIZONA_I2C) += arizona-i2c.o obj-$(CONFIG_MFD_ARIZONA_SPI) += arizona-spi.o -ifneq ($(CONFIG_MFD_WM5102),n) +ifeq ($(CONFIG_MFD_WM5102),y) obj-$(CONFIG_MFD_ARIZONA) += wm5102-tables.o endif -ifneq ($(CONFIG_MFD_WM5110),n) +ifeq ($(CONFIG_MFD_WM5110),y) obj-$(CONFIG_MFD_ARIZONA) += wm5110-tables.o endif -ifneq ($(CONFIG_MFD_WM8997),n) +ifeq ($(CONFIG_MFD_WM8997),y) obj-$(CONFIG_MFD_ARIZONA) += wm8997-tables.o endif obj-$(CONFIG_MFD_WM8400) += wm8400-core.o diff --git a/include/linux/mfd/arizona/core.h b/include/linux/mfd/arizona/core.h index 16a498f..7597164 100644 --- a/include/linux/mfd/arizona/core.h +++ b/include/linux/mfd/arizona/core.h @@ -153,7 +153,15 @@ int arizona_request_irq(struct arizona *arizona, int irq, char *name, void arizona_free_irq(struct arizona *arizona, int irq, void *data); int arizona_set_irq_wake(struct arizona *arizona, int irq, int on); +#ifdef CONFIG_MFD_WM5102 int wm5102_patch(struct arizona *arizona); +#else +static inline int wm5102_patch(struct arizona *arizona) +{ + return 0; +} +#endif + int wm5110_patch(struct arizona *arizona); int wm8997_patch(struct arizona *arizona); -- 1.7.2.5 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/