All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] i2c: mv64xxx: Fix compilation breakage
@ 2014-03-07 14:59 ` Maxime Ripard
  0 siblings, 0 replies; 36+ messages in thread
From: Maxime Ripard @ 2014-03-07 14:59 UTC (permalink / raw)
  To: Wolfram Sang
  Cc: linux-i2c, linux-arm-kernel, linux-kernel, kevin.z.m.zh, sunny,
	shuge, zhuzhenhua, linux, Maxime Ripard

Commit 370136bc67c3 ("i2c: mv64xxx: Add reset deassert call"), introduced a
recursive dependency, which was fixed by commit 80c69915e5fb ("i2c: mv64xxx:
fix circular Kconfig dependency", that in turn, by dropping the dependency on
RESET_CONTROLLER, introduced a compilation breakage whenever this option wasn't
set.

drivers/i2c/busses/i2c-mv64xxx.c:924: undefined reference to `reset_control_assert'
drivers/i2c/busses/i2c-mv64xxx.c:904: undefined reference to `reset_control_assert'
drivers/i2c/busses/i2c-mv64xxx.c:771: undefined reference to `devm_reset_control_get'
drivers/i2c/busses/i2c-mv64xxx.c:778: undefined reference to `reset_control_deassert'

Since the reset framework doesn't define dummy stubs whenever
CONFIG_RESET_CONTROLLER is not defined, protect the reset framework calls by
IS_ENABLED tests to make sure it won't be compiled in.

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
---
 drivers/i2c/busses/i2c-mv64xxx.c | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/drivers/i2c/busses/i2c-mv64xxx.c b/drivers/i2c/busses/i2c-mv64xxx.c
index 203a548..a1dc99b 100644
--- a/drivers/i2c/busses/i2c-mv64xxx.c
+++ b/drivers/i2c/busses/i2c-mv64xxx.c
@@ -768,14 +768,16 @@ mv64xxx_of_config(struct mv64xxx_i2c_data *drv_data,
 	}
 	drv_data->irq = irq_of_parse_and_map(np, 0);
 
-	drv_data->rstc = devm_reset_control_get(dev, NULL);
-	if (IS_ERR(drv_data->rstc)) {
-		if (PTR_ERR(drv_data->rstc) == -EPROBE_DEFER) {
-			rc = -EPROBE_DEFER;
-			goto out;
+	if (IS_ENABLED(CONFIG_RESET_CONTROLLER)) {
+		drv_data->rstc = devm_reset_control_get(dev, NULL);
+		if (IS_ERR(drv_data->rstc)) {
+			if (PTR_ERR(drv_data->rstc) == -EPROBE_DEFER) {
+				rc = -EPROBE_DEFER;
+				goto out;
+			}
+		} else {
+			reset_control_deassert(drv_data->rstc);
 		}
-	} else {
-		reset_control_deassert(drv_data->rstc);
 	}
 
 	/* Its not yet defined how timeouts will be specified in device tree.
@@ -900,7 +902,8 @@ mv64xxx_i2c_probe(struct platform_device *pd)
 exit_free_irq:
 	free_irq(drv_data->irq, drv_data);
 exit_reset:
-	if (pd->dev.of_node && !IS_ERR(drv_data->rstc))
+	if (pd->dev.of_node && IS_ENABLED(CONFIG_RESET_CONTROLLER) &&
+	    !IS_ERR(drv_data->rstc))
 		reset_control_assert(drv_data->rstc);
 exit_clk:
 #if defined(CONFIG_HAVE_CLK)
@@ -920,7 +923,8 @@ mv64xxx_i2c_remove(struct platform_device *dev)
 
 	i2c_del_adapter(&drv_data->adapter);
 	free_irq(drv_data->irq, drv_data);
-	if (dev->dev.of_node && !IS_ERR(drv_data->rstc))
+	if (dev->dev.of_node && IS_ENABLED(CONFIG_RESET_CONTROLLER) &&
+	    !IS_ERR(drv_data->rstc))
 		reset_control_assert(drv_data->rstc);
 #if defined(CONFIG_HAVE_CLK)
 	/* Not all platforms have a clk */
-- 
1.9.0


^ permalink raw reply related	[flat|nested] 36+ messages in thread

end of thread, other threads:[~2014-03-28  7:48 UTC | newest]

Thread overview: 36+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-03-07 14:59 [PATCH] i2c: mv64xxx: Fix compilation breakage Maxime Ripard
2014-03-07 14:59 ` Maxime Ripard
2014-03-07 14:59 ` Maxime Ripard
2014-03-07 16:08 ` Russell King - ARM Linux
2014-03-07 16:08   ` Russell King - ARM Linux
2014-03-07 16:08   ` Russell King - ARM Linux
2014-03-07 17:19   ` Maxime Ripard
2014-03-07 17:19     ` Maxime Ripard
2014-03-07 17:29     ` Wolfram Sang
2014-03-07 17:29       ` Wolfram Sang
2014-03-07 17:52       ` Maxime Ripard
2014-03-07 17:52         ` Maxime Ripard
2014-03-07 17:52         ` Maxime Ripard
2014-03-10 10:58   ` Maxime Ripard
2014-03-10 10:58     ` Maxime Ripard
2014-03-10 11:29     ` Russell King - ARM Linux
2014-03-10 11:29       ` Russell King - ARM Linux
2014-03-10 11:29       ` Russell King - ARM Linux
2014-03-21 15:49       ` Paul Gortmaker
2014-03-21 15:49         ` Paul Gortmaker
2014-03-21 15:49         ` Paul Gortmaker
2014-03-21 19:17         ` Maxime Ripard
2014-03-21 19:17           ` Maxime Ripard
2014-03-22 11:11           ` Arnd Bergmann
2014-03-22 11:11             ` Arnd Bergmann
2014-03-22 11:11             ` Arnd Bergmann
2014-03-24  9:41             ` Maxime Ripard
2014-03-24  9:41               ` Maxime Ripard
2014-03-28  7:48               ` Wolfram Sang
2014-03-28  7:48                 ` Wolfram Sang
2014-03-24 13:33           ` Wolfram Sang
2014-03-24 13:33             ` Wolfram Sang
2014-03-24 13:33             ` Wolfram Sang
2014-03-24 14:03             ` Gregory CLEMENT
2014-03-24 14:03               ` Gregory CLEMENT
2014-03-24 14:03               ` Gregory CLEMENT

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.