Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934325AbbEMQvf (ORCPT ); Wed, 13 May 2015 12:51:35 -0400 Received: from mail-wi0-f170.google.com ([209.85.212.170]:38260 "EHLO mail-wi0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933800AbbEMQve (ORCPT ); Wed, 13 May 2015 12:51:34 -0400 Date: Wed, 13 May 2015 17:51:28 +0100 From: Lee Jones To: Richard Fitzgerald Cc: linux-kernel@vger.kernel.org, patches@opensource.wolfsonmicro.com Subject: Re: [PATCH v2 1/2] mfd: arizona: Add stub for wm5102_patch() Message-ID: <20150513165128.GD19543@x1> References: <1431532346-10851-1-git-send-email-rf@opensource.wolfsonmicro.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <1431532346-10851-1-git-send-email-rf@opensource.wolfsonmicro.com> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1669 Lines: 46 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 > Acked-by: Lee Jones > --- > 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 -- 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/