Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760823AbaGRIRw (ORCPT ); Fri, 18 Jul 2014 04:17:52 -0400 Received: from mail-ie0-f176.google.com ([209.85.223.176]:48233 "EHLO mail-ie0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1760794AbaGRIRs (ORCPT ); Fri, 18 Jul 2014 04:17:48 -0400 Date: Fri, 18 Jul 2014 09:17:42 +0100 From: Lee Jones To: Javier Martinez Canillas Cc: Mark Brown , Mike Turquette , Liam Girdwood , Alessandro Zummo , Kukjin Kim , Doug Anderson , Olof Johansson , Tomeu Vizoso , Krzysztof Kozlowski , Yadwinder Singh Brar , Tushar Behera , Andreas Farber , linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linux-samsung-soc@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v7 03/24] mfd: max77686: Don't define dummy function if OF isn't enabled Message-ID: <20140718081742.GM30888@lee--X1> References: <1404505467-26526-1-git-send-email-javier.martinez@collabora.co.uk> <1404505467-26526-4-git-send-email-javier.martinez@collabora.co.uk> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <1404505467-26526-4-git-send-email-javier.martinez@collabora.co.uk> 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 On Fri, 04 Jul 2014, Javier Martinez Canillas wrote: > When the CONFIG_OF option was not enabled, a dummy function > max77686_i2c_parse_dt_pdata() was defined since this is called > unconditionally on probe(). Just always define the real function > and conditionally call it if CONFIG_OF is enabled instead. > > Signed-off-by: Javier Martinez Canillas > --- > drivers/mfd/max77686.c | 10 +--------- > 1 file changed, 1 insertion(+), 9 deletions(-) Applied now, thanks. > diff --git a/drivers/mfd/max77686.c b/drivers/mfd/max77686.c > index a38e9ee..d1f9d04 100644 > --- a/drivers/mfd/max77686.c > +++ b/drivers/mfd/max77686.c > @@ -96,7 +96,6 @@ static const struct regmap_irq_chip max77686_rtc_irq_chip = { > .num_irqs = ARRAY_SIZE(max77686_rtc_irqs), > }; > > -#ifdef CONFIG_OF > static const struct of_device_id max77686_pmic_dt_match[] = { > {.compatible = "maxim,max77686", .data = NULL}, > {}, > @@ -116,13 +115,6 @@ static struct max77686_platform_data *max77686_i2c_parse_dt_pdata(struct device > dev->platform_data = pd; > return pd; > } > -#else > -static struct max77686_platform_data *max77686_i2c_parse_dt_pdata(struct device > - *dev) > -{ > - return 0; > -} > -#endif > > static int max77686_i2c_probe(struct i2c_client *i2c, > const struct i2c_device_id *id) > @@ -132,7 +124,7 @@ static int max77686_i2c_probe(struct i2c_client *i2c, > unsigned int data; > int ret = 0; > > - if (i2c->dev.of_node) > + if (IS_ENABLED(CONFIG_OF) && i2c->dev.of_node) > pdata = max77686_i2c_parse_dt_pdata(&i2c->dev); > > if (!pdata) { -- 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/