Messages in this thread | | | Date | Wed, 13 May 2015 17:51:28 +0100 | From | Lee Jones <> | Subject | Re: [PATCH v2 1/2] mfd: arizona: Add stub for wm5102_patch() |
| |
On Wed, 13 May 2015, Richard Fitzgerald wrote:
> For the WM5102 there is a dependency in the core code on wm5102_patch() > which only exists when CONFIG_MFD_WM5102 is defined. To avoid having > to sprinkle #ifdefs around the code it is given an alternative empty > stub version when CONFIG_MFD_WM5102 is deselected > > Signed-off-by: Richard Fitzgerald <rf@opensource.wolfsonmicro.com> > Acked-by: Lee Jones <lee.jones@linaro.org> > --- > include/linux/mfd/arizona/core.h | 8 ++++++++ > 1 files changed, 8 insertions(+), 0 deletions(-)
Applied, thanks.
> 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
| |