lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Fri, 4 Jul 2014 11:55:02 +0200 From: Javier Martinez Canillas <javier.martinez@...labora.co.uk> To: Lee Jones <lee.jones@...aro.org> Cc: Mark Brown <broonie@...nel.org>, Mike Turquette <mturquette@...aro.org>, Liam Girdwood <lgirdwood@...il.com>, Alessandro Zummo <a.zummo@...ertech.it>, Kukjin Kim <kgene.kim@...sung.com>, Doug Anderson <dianders@...omium.org>, Olof Johansson <olof@...om.net>, Tomeu Vizoso <tomeu.vizoso@...labora.com>, Krzysztof Kozlowski <k.kozlowski@...sung.com>, Yadwinder Singh Brar <yadi.brar01@...il.com>, Tushar Behera <trblinux@...il.com>, Andreas Farber <afaerber@...e.de>, linux-arm-kernel@...ts.infradead.org, devicetree@...r.kernel.org, linux-samsung-soc@...r.kernel.org, linux-kernel@...r.kernel.org, Javier Martinez Canillas <javier.martinez@...labora.co.uk> Subject: [PATCH v6 03/23] mfd: max77686: Don't define dummy function if OF isn't enabled 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 <javier.martinez@...labora.co.uk> --- drivers/mfd/max77686.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) 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) { -- 2.0.0.rc2 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists