From: Maxime Ripard <maxime.ripard@free-electrons.com>
To: Wolfram Sang <wsa@the-dreams.de>
Cc: linux-i2c@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, kevin.z.m.zh@gmail.com,
sunny@allwinnertech.com, shuge@allwinnertech.com,
zhuzhenhua@allwinnertech.com, linux@arm.linux.org.uk,
Maxime Ripard <maxime.ripard@free-electrons.com>
Subject: [PATCH] i2c: mv64xxx: Fix circular dependencies warning and compilation breakage
Date: Fri, 7 Mar 2014 14:43:15 +0100 [thread overview]
Message-ID: <1394199795-5516-1-git-send-email-maxime.ripard@free-electrons.com> (raw)
In-Reply-To: <20140307111858.GB12274@katana>
This patch fixes the circular dependency introduced by commit 370136bc67c3
("i2c: mv64xxx: Add reset deassert call"):
drivers/video/Kconfig:42:error: recursive dependency detected!
Since the reset framework doesn't define dummy stubs whenever
CONFIG_RESET_CONTROLLER is not defined, it's the only sane way to have a driver
that compiles in any cases.
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
---
drivers/i2c/busses/Kconfig | 1 -
drivers/i2c/busses/i2c-mv64xxx.c | 22 +++++++++++++---------
2 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
index 70bcad9..f5ed031 100644
--- a/drivers/i2c/busses/Kconfig
+++ b/drivers/i2c/busses/Kconfig
@@ -528,7 +528,6 @@ config I2C_MPC
config I2C_MV64XXX
tristate "Marvell mv64xxx I2C Controller"
depends on (MV64X60 || PLAT_ORION || ARCH_SUNXI)
- select RESET_CONTROLLER
help
If you say yes to this option, support will be included for the
built-in I2C interface on the Marvell 64xxx line of host bridges.
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
next prev parent reply other threads:[~2014-03-07 13:45 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-04 16:28 [PATCH v3 0/5] ARM: sun6i: Add support for the A31 I2C controller Maxime Ripard
2014-03-04 16:28 ` [PATCH v3 1/5] i2c: mv64xxx: Add reset deassert call Maxime Ripard
2014-03-05 16:31 ` Wolfram Sang
2014-03-07 9:52 ` Russell King - ARM Linux
2014-03-07 10:07 ` Maxime Ripard
2014-03-07 10:34 ` Russell King - ARM Linux
2014-03-07 10:37 ` Wolfram Sang
2014-03-07 11:11 ` [linux-sunxi] " Chen-Yu Tsai
2014-03-07 11:18 ` Wolfram Sang
2014-03-07 13:43 ` Maxime Ripard [this message]
2014-03-07 14:24 ` [PATCH] i2c: mv64xxx: Fix circular dependencies warning and compilation breakage Wolfram Sang
2014-03-07 14:26 ` Wolfram Sang
2014-03-07 14:48 ` Maxime Ripard
2014-03-07 13:44 ` [linux-sunxi] Re: [PATCH v3 1/5] i2c: mv64xxx: Add reset deassert call Maxime Ripard
2014-03-04 16:28 ` [PATCH v3 2/5] i2c: mv64xxx: Add support for the Allwinner A31 I2C driver Maxime Ripard
2014-03-05 16:34 ` Wolfram Sang
2014-03-07 10:13 ` Maxime Ripard
2014-03-04 16:28 ` [PATCH v3 3/5] ARM: sun6i: Enable the I2C controllers Maxime Ripard
2014-03-04 16:28 ` [PATCH v3 4/5] ARM: sun6i: Enable the I2C muxing options Maxime Ripard
2014-03-04 16:28 ` [PATCH v3 5/5] ARM: sun6i: colombus: Enable the I2C controllers Maxime Ripard
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1394199795-5516-1-git-send-email-maxime.ripard@free-electrons.com \
--to=maxime.ripard@free-electrons.com \
--cc=kevin.z.m.zh@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-i2c@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@arm.linux.org.uk \
--cc=shuge@allwinnertech.com \
--cc=sunny@allwinnertech.com \
--cc=wsa@the-dreams.de \
--cc=zhuzhenhua@allwinnertech.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®