From: Lee Jones <lee.jones@linaro.org>
To: Richard Fitzgerald <rf@opensource.wolfsonmicro.com>
Cc: linux-kernel@vger.kernel.org,
patches@opensource.wolfsonmicro.com, pebolle@tiscali.nl
Subject: Re: [PATCH] mfd: arizona: Fix incorrect Makefile conditionals
Date: Wed, 13 May 2015 15:15:13 +0100 [thread overview]
Message-ID: <20150513141513.GY3394@x1> (raw)
In-Reply-To: <1430830201-18952-1-git-send-email-rf@opensource.wolfsonmicro.com>
On Tue, 05 May 2015, Richard Fitzgerald wrote:
> 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 <rf@opensource.wolfsonmicro.com>
> ---
> drivers/mfd/Makefile | 6 +++---
> include/linux/mfd/arizona/core.h | 8 ++++++++
> 2 files changed, 11 insertions(+), 3 deletions(-)
I think this patch should be split into 2.
You can add my:
Acked-by: Lee Jones <lee.jones@linaro.org>
... to both of them when you re-submit.
> 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);
>
--
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
prev parent reply other threads:[~2015-05-13 14:15 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-05 12:50 [PATCH] mfd: arizona: Fix incorrect Makefile conditionals Richard Fitzgerald
2015-05-13 14:15 ` Lee Jones [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20150513141513.GY3394@x1 \
--to=lee.jones@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=patches@opensource.wolfsonmicro.com \
--cc=pebolle@tiscali.nl \
--cc=rf@opensource.wolfsonmicro.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox