| Message ID | 1394199795-5516-1-git-send-email-maxime.ripard@free-electrons.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
New patch -> new thread, please. > This patch fixes the circular dependency introduced by commit 370136bc67c3 > ("i2c: mv64xxx: Add reset deassert call"): > > drivers/video/Kconfig:42:error: recursive dependency detected! Please base it on i2c-next. I already applied my patch. Your patch fixes the build error discovered by it. > 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. Paragraph needs reformat. And please drop "sane". #ifdefs are not sane. Fixing the reset framework would be sane. > @@ -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)) Why don't you simply set rstc to some ERR_PTR above if not RESET_CONTROLLER?
> Why don't you simply set rstc to some ERR_PTR above if not > RESET_CONTROLLER? I know why. Sorry for the noise.
On Fri, Mar 07, 2014 at 03:24:05PM +0100, Wolfram Sang wrote: > > New patch -> new thread, please. > > > This patch fixes the circular dependency introduced by commit 370136bc67c3 > > ("i2c: mv64xxx: Add reset deassert call"): > > > > drivers/video/Kconfig:42:error: recursive dependency detected! > > Please base it on i2c-next. I already applied my patch. > Your patch fixes the build error discovered by it. I didn't realise that. I will. > > 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. > > Paragraph needs reformat. And please drop "sane". #ifdefs are not sane. > Fixing the reset framework would be sane. Ok.. Maxime
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 */
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(-)