Re: [PATCH] i2c: don't print error when adding adapter fails

2016-10-05 Thread Jean Delvare
On Tue,  9 Aug 2016 13:36:17 +0200, Wolfram Sang wrote:
> The core will do this for us now.
> 
> Signed-off-by: Wolfram Sang 
> ---
>  drivers/i2c/busses/i2c-amd756.c | 5 +
>  drivers/i2c/busses/i2c-at91.c   | 2 --
>  drivers/i2c/busses/i2c-axxia.c  | 8 +---
>  drivers/i2c/busses/i2c-bcm-iproc.c  | 8 +---
>  drivers/i2c/busses/i2c-bcm-kona.c   | 4 +---
>  drivers/i2c/busses/i2c-bfin-twi.c   | 4 +---
>  drivers/i2c/busses/i2c-brcmstb.c| 4 +---
>  drivers/i2c/busses/i2c-cadence.c| 4 +---
>  drivers/i2c/busses/i2c-cpm.c| 4 +---
>  drivers/i2c/busses/i2c-cros-ec-tunnel.c | 4 +---
>  drivers/i2c/busses/i2c-davinci.c| 4 +---
>  drivers/i2c/busses/i2c-diolan-u2c.c | 4 +---
>  drivers/i2c/busses/i2c-dln2.c   | 4 +---
>  drivers/i2c/busses/i2c-efm32.c  | 1 -
>  drivers/i2c/busses/i2c-exynos5.c| 4 +---
>  drivers/i2c/busses/i2c-hix5hd2.c| 4 +---
>  drivers/i2c/busses/i2c-i801.c   | 1 -
>  drivers/i2c/busses/i2c-ibm_iic.c| 4 +---
>  drivers/i2c/busses/i2c-img-scb.c| 4 +---
>  drivers/i2c/busses/i2c-imx.c| 4 +---
>  drivers/i2c/busses/i2c-isch.c   | 4 +---
>  drivers/i2c/busses/i2c-ismt.c   | 4 +---
>  drivers/i2c/busses/i2c-jz4780.c | 4 +---
>  drivers/i2c/busses/i2c-lpc2k.c  | 4 +---
>  drivers/i2c/busses/i2c-meson.c  | 1 -
>  drivers/i2c/busses/i2c-mpc.c| 4 +---
>  drivers/i2c/busses/i2c-mt65xx.c | 4 +---
>  drivers/i2c/busses/i2c-mxs.c| 1 -
>  drivers/i2c/busses/i2c-nforce2.c| 1 -
>  drivers/i2c/busses/i2c-nomadik.c| 4 +---
>  drivers/i2c/busses/i2c-ocores.c | 4 +---
>  drivers/i2c/busses/i2c-octeon.c | 4 +---
>  drivers/i2c/busses/i2c-omap.c   | 4 +---
>  drivers/i2c/busses/i2c-piix4.c  | 1 -
>  drivers/i2c/busses/i2c-pmcmsp.c | 4 +---
>  drivers/i2c/busses/i2c-pnx.c| 4 +---
>  drivers/i2c/busses/i2c-puv3.c   | 5 +
>  drivers/i2c/busses/i2c-pxa.c| 4 +---
>  drivers/i2c/busses/i2c-rcar.c   | 4 +---
>  drivers/i2c/busses/i2c-riic.c   | 4 +---
>  drivers/i2c/busses/i2c-rk3x.c   | 4 +---
>  drivers/i2c/busses/i2c-s3c2410.c| 1 -
>  drivers/i2c/busses/i2c-sh7760.c | 4 +---
>  drivers/i2c/busses/i2c-sh_mobile.c  | 1 -
>  drivers/i2c/busses/i2c-sirf.c   | 4 +---
>  drivers/i2c/busses/i2c-st.c | 4 +---
>  drivers/i2c/busses/i2c-stu300.c | 5 +
>  drivers/i2c/busses/i2c-tegra.c  | 4 +---
>  drivers/i2c/busses/i2c-uniphier-f.c | 7 +--
>  drivers/i2c/busses/i2c-uniphier.c   | 7 +--
>  drivers/i2c/busses/i2c-wmt.c| 4 +---
>  drivers/i2c/busses/i2c-xgene-slimpro.c  | 1 -
>  drivers/i2c/busses/i2c-xiic.c   | 1 -
>  drivers/i2c/busses/i2c-xlp9xx.c | 4 +---
>  drivers/i2c/busses/i2c-xlr.c| 4 +---
>  55 files changed, 44 insertions(+), 161 deletions(-)
> (...)

I like the idea.

For i2c-amd756, i2c-diolan-u2c, i2c-i801, i2c-isch, i2c-ismt,
i2c-nforce and i2c-piix4:

Reviewed-by: Jean Delvare 

-- 
Jean Delvare
SUSE L3 Support


Re: [PATCH] i2c: don't print error when adding adapter fails

2016-08-14 Thread Wolfram Sang
On Tue, Aug 09, 2016 at 01:36:16PM +0200, Wolfram Sang wrote:
> Since v4.8-rc1, the I2C core will print detailed information when adding an 
> I2C
> adapter fails. So, drivers can skip this now.
> 
> I am still undecided if I apply this as a single patch or break it out. But 
> for
> reviewing, avoiding the patch bomb is probably a good thing.
> 
> Should go via subsystem tree, I'd think.
> 
> Wolfram Sang (1):
>   i2c: don't print error when adding adapter fails
> 

Applied to for-next, thanks!



signature.asc
Description: PGP signature


Re: [PATCH] i2c: don't print error when adding adapter fails

2016-08-10 Thread Laxman Dewangan


On Tuesday 09 August 2016 05:06 PM, Wolfram Sang wrote:

The core will do this for us now.


For i2c-tegra.c

Acked-by: Laxman Dewangan 



Re: [PATCH] i2c: don't print error when adding adapter fails

2016-08-10 Thread Krzysztof Kozlowski
On 08/09/2016 01:36 PM, Wolfram Sang wrote:
> The core will do this for us now.
> 
> Signed-off-by: Wolfram Sang 
> ---

(...)

>  drivers/i2c/busses/i2c-exynos5.c| 4 +---
>  drivers/i2c/busses/i2c-s3c2410.c| 1 -

For Exynos and S3C2410:
Acked-by: Krzysztof Kozlowski 

Best regards,
Krzysztof


Re: [STLinux Kernel] [PATCH] i2c: don't print error when adding adapter fails

2016-08-10 Thread Patrice Chotard
On 08/09/2016 01:36 PM, Wolfram Sang wrote:
> Since v4.8-rc1, the I2C core will print detailed information when adding an 
> I2C
> adapter fails. So, drivers can skip this now.
>
> I am still undecided if I apply this as a single patch or break it out. But 
> for
> reviewing, avoiding the patch bomb is probably a good thing.
>
> Should go via subsystem tree, I'd think.
>
> Wolfram Sang (1):
>   i2c: don't print error when adding adapter fails
>
>  drivers/i2c/busses/i2c-st.c | 4 +---
>

For i2c-st.c

Acked-by: Patrice Chotard 

Thanks


Re: [PATCH] i2c: don't print error when adding adapter fails

2016-08-10 Thread Ludovic Desroches
On Tue, Aug 09, 2016 at 01:36:17PM +0200, Wolfram Sang wrote:
> The core will do this for us now.
> 
> Signed-off-by: Wolfram Sang 
> ---

[...]

>  drivers/i2c/busses/i2c-at91.c   | 2 --

Acked-by: Ludovic Desroches 

[...]

> diff --git a/drivers/i2c/busses/i2c-at91.c b/drivers/i2c/busses/i2c-at91.c
> index f23372669f770f..03a519d29616d7 100644
> --- a/drivers/i2c/busses/i2c-at91.c
> +++ b/drivers/i2c/busses/i2c-at91.c
> @@ -1118,8 +1118,6 @@ static int at91_twi_probe(struct platform_device *pdev)
>  
>   rc = i2c_add_numbered_adapter(>adapter);
>   if (rc) {
> - dev_err(dev->dev, "Adapter %s registration failed\n",
> - dev->adapter.name);
>   clk_disable_unprepare(dev->clk);
>  
>   pm_runtime_disable(dev->dev);


RE: [PATCH] i2c: don't print error when adding adapter fails

2016-08-09 Thread Zhang, Sonic
For i2c-bfin-twi.c

Acked-by: Sonic Zhang <sonic.zh...@analog.com>


Sonic
-Original Message-
From: Neil Horman [mailto:nhor...@tuxdriver.com] 
Sent: Tuesday, August 09, 2016 8:55 PM
To: Wolfram Sang
Cc: linux-ker...@vger.kernel.org; linux-...@vger.kernel.org; Jean Delvare; 
Wolfram Sang; Ludovic Desroches; Ray Jui; Scott Branden; Jon Mason; 
bcm-kernel-feedback-l...@broadcom.com; Florian Fainelli; Zhang, Sonic; Brian 
Norris; Gregory Fong; Michal Simek; Sören Brinkmann; Jochen Friedrich; Sekhar 
Nori; Kevin Hilman; Guenter Roeck; Uwe Kleine-König; Kukjin Kim; Krzysztof 
Kozlowski; Seth Heasley; Joachim Eastwood; Carlo Caione; Alessandro Rubini; 
Linus Walleij; Peter Korsgaard; Tony Lindgren; Vladimir Zapolskiy; Sylvain 
Lemieux; Guan Xuetao; Heiko Stuebner; Barry Song; Patrice Chotard; Laxman 
Dewangan; Stephen Warren; Thierry Reding; Alexandre Courbot; Masahiro Yamada; 
Tony Prisk; linux-arm-ker...@lists.infradead.org; 
adi-buildroot-de...@lists.sourceforge.net; linuxppc-dev@lists.ozlabs.org; 
linux-samsung-...@vger.kernel.org; linux-amlo...@lists.infradead.org; 
linux-o...@vger.kernel.org; linux-rockc...@lists.infradead.org; 
ker...@stlinux.com; linux-te...@vger.kernel.org
Subject: Re: [PATCH] i2c: don't print error when adding adapter fails

On Tue, Aug 09, 2016 at 01:36:17PM +0200, Wolfram Sang wrote:
> The core will do this for us now.
> 
> Signed-off-by: Wolfram Sang <wsa-...@sang-engineering.com>
> ---
>  drivers/i2c/busses/i2c-amd756.c | 5 +
>  drivers/i2c/busses/i2c-at91.c   | 2 --
>  drivers/i2c/busses/i2c-axxia.c  | 8 +---
>  drivers/i2c/busses/i2c-bcm-iproc.c  | 8 +---
>  drivers/i2c/busses/i2c-bcm-kona.c   | 4 +---
>  drivers/i2c/busses/i2c-bfin-twi.c   | 4 +---
>  drivers/i2c/busses/i2c-brcmstb.c| 4 +---
>  drivers/i2c/busses/i2c-cadence.c| 4 +---
>  drivers/i2c/busses/i2c-cpm.c| 4 +---
>  drivers/i2c/busses/i2c-cros-ec-tunnel.c | 4 +---
>  drivers/i2c/busses/i2c-davinci.c| 4 +---
>  drivers/i2c/busses/i2c-diolan-u2c.c | 4 +---
>  drivers/i2c/busses/i2c-dln2.c   | 4 +---
>  drivers/i2c/busses/i2c-efm32.c  | 1 -
>  drivers/i2c/busses/i2c-exynos5.c| 4 +---
>  drivers/i2c/busses/i2c-hix5hd2.c| 4 +---
>  drivers/i2c/busses/i2c-i801.c   | 1 -
>  drivers/i2c/busses/i2c-ibm_iic.c| 4 +---
>  drivers/i2c/busses/i2c-img-scb.c| 4 +---
>  drivers/i2c/busses/i2c-imx.c| 4 +---
>  drivers/i2c/busses/i2c-isch.c   | 4 +---
>  drivers/i2c/busses/i2c-ismt.c   | 4 +---
>  drivers/i2c/busses/i2c-jz4780.c | 4 +---
>  drivers/i2c/busses/i2c-lpc2k.c  | 4 +---
>  drivers/i2c/busses/i2c-meson.c  | 1 -
>  drivers/i2c/busses/i2c-mpc.c| 4 +---
>  drivers/i2c/busses/i2c-mt65xx.c | 4 +---
>  drivers/i2c/busses/i2c-mxs.c| 1 -
>  drivers/i2c/busses/i2c-nforce2.c| 1 -
>  drivers/i2c/busses/i2c-nomadik.c| 4 +---
>  drivers/i2c/busses/i2c-ocores.c | 4 +---
>  drivers/i2c/busses/i2c-octeon.c | 4 +---
>  drivers/i2c/busses/i2c-omap.c   | 4 +---
>  drivers/i2c/busses/i2c-piix4.c  | 1 -
>  drivers/i2c/busses/i2c-pmcmsp.c | 4 +---
>  drivers/i2c/busses/i2c-pnx.c| 4 +---
>  drivers/i2c/busses/i2c-puv3.c   | 5 +
>  drivers/i2c/busses/i2c-pxa.c| 4 +---
>  drivers/i2c/busses/i2c-rcar.c   | 4 +---
>  drivers/i2c/busses/i2c-riic.c   | 4 +---
>  drivers/i2c/busses/i2c-rk3x.c   | 4 +---
>  drivers/i2c/busses/i2c-s3c2410.c| 1 -
>  drivers/i2c/busses/i2c-sh7760.c | 4 +---
>  drivers/i2c/busses/i2c-sh_mobile.c  | 1 -
>  drivers/i2c/busses/i2c-sirf.c   | 4 +---
>  drivers/i2c/busses/i2c-st.c | 4 +---
>  drivers/i2c/busses/i2c-stu300.c | 5 +
>  drivers/i2c/busses/i2c-tegra.c  | 4 +---
>  drivers/i2c/busses/i2c-uniphier-f.c | 7 +--
>  drivers/i2c/busses/i2c-uniphier.c   | 7 +--
>  drivers/i2c/busses/i2c-wmt.c| 4 +---
>  drivers/i2c/busses/i2c-xgene-slimpro.c  | 1 -
>  drivers/i2c/busses/i2c-xiic.c   | 1 -
>  drivers/i2c/busses/i2c-xlp9xx.c | 4 +---
>  drivers/i2c/busses/i2c-xlr.c| 4 +---
>  55 files changed, 44 insertions(+), 161 deletions(-)
> 
> diff --git a/drivers/i2c/busses/i2c-amd756.c 
> b/drivers/i2c/busses/i2c-amd756.c index 6c7113d990f882..274908cd1fdeab 
> 100644
> --- a/drivers/i2c/busses/i2c-amd756.c
> +++ b/drivers/i2c/busses/i2c-amd756.c
> @@ -378,11 +378,8 @@ static int amd756_probe(struct pci_dev *pdev, const 
> struct pci_device_id *id)
>amd756_ioport);
>  
>   error = i2c_add_adapter(_smbus);
> - if (error) {
> -

Re: [PATCH] i2c: don't print error when adding adapter fails

2016-08-09 Thread Joachim Eastwood
On 9 August 2016 at 13:36, Wolfram Sang  wrote:
> Since v4.8-rc1, the I2C core will print detailed information when adding an 
> I2C
> adapter fails. So, drivers can skip this now.
>
> I am still undecided if I apply this as a single patch or break it out. But 
> for
> reviewing, avoiding the patch bomb is probably a good thing.
>
> Should go via subsystem tree, I'd think.
>
> Wolfram Sang (1):
>   i2c: don't print error when adding adapter fails


For
>  drivers/i2c/busses/i2c-lpc2k.c  | 4 +---

Acked-by: Joachim Eastwood 


regards,
Joachim Eastwood


Re: [PATCH] i2c: don't print error when adding adapter fails

2016-08-09 Thread Ray Jui

Hi Wolfram,

On 8/9/2016 4:36 AM, Wolfram Sang wrote:

The core will do this for us now.

Signed-off-by: Wolfram Sang 


[...]


diff --git a/drivers/i2c/busses/i2c-bcm-iproc.c 
b/drivers/i2c/busses/i2c-bcm-iproc.c
index 19c843828fe2ca..8e3477f9297eda 100644
--- a/drivers/i2c/busses/i2c-bcm-iproc.c
+++ b/drivers/i2c/busses/i2c-bcm-iproc.c
@@ -488,13 +488,7 @@ static int bcm_iproc_i2c_probe(struct platform_device 
*pdev)
adap->dev.parent = >dev;
adap->dev.of_node = pdev->dev.of_node;

-   ret = i2c_add_adapter(adap);
-   if (ret) {
-   dev_err(iproc_i2c->device, "failed to add adapter\n");
-   return ret;
-   }
-
-   return 0;
+   return i2c_add_adapter(adap);
 }

 static int bcm_iproc_i2c_remove(struct platform_device *pdev)
diff --git a/drivers/i2c/busses/i2c-bcm-kona.c 
b/drivers/i2c/busses/i2c-bcm-kona.c
index ac9f47679c3a4b..a5c9098507896b 100644
--- a/drivers/i2c/busses/i2c-bcm-kona.c
+++ b/drivers/i2c/busses/i2c-bcm-kona.c
@@ -858,10 +858,8 @@ static int bcm_kona_i2c_probe(struct platform_device *pdev)
adap->dev.of_node = pdev->dev.of_node;

rc = i2c_add_adapter(adap);
-   if (rc) {
-   dev_err(dev->device, "failed to add adapter\n");
+   if (rc)
return rc;
-   }

dev_info(dev->device, "device registered successfully\n");



For both i2c-bcm-iproc.c and i2c-bcm-kona.c:

Acked-by: Ray Jui 

Thanks,

Ray



Re: [PATCH] i2c: don't print error when adding adapter fails

2016-08-09 Thread Vladimir Zapolskiy
On 09.08.2016 14:36, Wolfram Sang wrote:
> The core will do this for us now.
> 
> Signed-off-by: Wolfram Sang 
> ---

For 

>  drivers/i2c/busses/i2c-pnx.c| 4 +---

[snip]

> diff --git a/drivers/i2c/busses/i2c-pnx.c b/drivers/i2c/busses/i2c-pnx.c
> index 7ea67aa46fb730..fd5f9d2bf6d94e 100644
> --- a/drivers/i2c/busses/i2c-pnx.c
> +++ b/drivers/i2c/busses/i2c-pnx.c
> @@ -714,10 +714,8 @@ static int i2c_pnx_probe(struct platform_device *pdev)
>  
>   /* Register this adapter with the I2C subsystem */
>   ret = i2c_add_numbered_adapter(_data->adapter);
> - if (ret < 0) {
> - dev_err(>dev, "I2C: Failed to add bus\n");
> + if (ret < 0)
>   goto out_clock;
> - }
>  
>   dev_dbg(>dev, "%s: Master at %#8x, irq %d.\n",
>   alg_data->adapter.name, res->start, alg_data->irq);

Acked-by: Vladimir Zapolskiy 

--
With best wishes,
Vladimir


Re: [PATCH] i2c: don't print error when adding adapter fails

2016-08-09 Thread Wolfram Sang

> >@@ -550,15 +550,10 @@ static int uniphier_fi2c_probe(struct platform_device 
> >*pdev)
> > }
> >
> > ret = i2c_add_adapter(>adap);
> >-if (ret) {
> >-dev_err(dev, "failed to add I2C adapter\n");
> >-goto err;
> >-}
> >-
> >-err:
> > if (ret)
> > clk_disable_unprepare(priv->clk);
> >
> >+ err:
> 
> You sure about that one ? It leaves the clock enabled in some of the error 
> paths.

Uh, ehrm, where is the brown paper bag? Thanks, Guenter!

> Note: I dropped all individuals from Cc:; my mailer refused to accept the 
> reply because there
> were too many.

Yes, the disadvantage of not breaking out.



signature.asc
Description: PGP signature


Re: [PATCH] i2c: don't print error when adding adapter fails

2016-08-09 Thread Wolfram Sang
On Tue, Aug 09, 2016 at 01:57:40PM +0200, Uwe Kleine-König wrote:
> Hello Wolfram,
> 
> On Tue, Aug 09, 2016 at 01:36:17PM +0200, Wolfram Sang wrote:
> > The core will do this for us now.
> 
> Would be nice to point out the relevant commit that changed the core in
> the commit log.

I agree, but it was a series of commits[1] so I skipped that idea.

[1] http://www.spinics.net/lists/linux-i2c/msg25496.html



signature.asc
Description: PGP signature


Re: [PATCH] i2c: don't print error when adding adapter fails

2016-08-09 Thread Neil Horman
On Tue, Aug 09, 2016 at 01:36:17PM +0200, Wolfram Sang wrote:
> The core will do this for us now.
> 
> Signed-off-by: Wolfram Sang 
> ---
>  drivers/i2c/busses/i2c-amd756.c | 5 +
>  drivers/i2c/busses/i2c-at91.c   | 2 --
>  drivers/i2c/busses/i2c-axxia.c  | 8 +---
>  drivers/i2c/busses/i2c-bcm-iproc.c  | 8 +---
>  drivers/i2c/busses/i2c-bcm-kona.c   | 4 +---
>  drivers/i2c/busses/i2c-bfin-twi.c   | 4 +---
>  drivers/i2c/busses/i2c-brcmstb.c| 4 +---
>  drivers/i2c/busses/i2c-cadence.c| 4 +---
>  drivers/i2c/busses/i2c-cpm.c| 4 +---
>  drivers/i2c/busses/i2c-cros-ec-tunnel.c | 4 +---
>  drivers/i2c/busses/i2c-davinci.c| 4 +---
>  drivers/i2c/busses/i2c-diolan-u2c.c | 4 +---
>  drivers/i2c/busses/i2c-dln2.c   | 4 +---
>  drivers/i2c/busses/i2c-efm32.c  | 1 -
>  drivers/i2c/busses/i2c-exynos5.c| 4 +---
>  drivers/i2c/busses/i2c-hix5hd2.c| 4 +---
>  drivers/i2c/busses/i2c-i801.c   | 1 -
>  drivers/i2c/busses/i2c-ibm_iic.c| 4 +---
>  drivers/i2c/busses/i2c-img-scb.c| 4 +---
>  drivers/i2c/busses/i2c-imx.c| 4 +---
>  drivers/i2c/busses/i2c-isch.c   | 4 +---
>  drivers/i2c/busses/i2c-ismt.c   | 4 +---
>  drivers/i2c/busses/i2c-jz4780.c | 4 +---
>  drivers/i2c/busses/i2c-lpc2k.c  | 4 +---
>  drivers/i2c/busses/i2c-meson.c  | 1 -
>  drivers/i2c/busses/i2c-mpc.c| 4 +---
>  drivers/i2c/busses/i2c-mt65xx.c | 4 +---
>  drivers/i2c/busses/i2c-mxs.c| 1 -
>  drivers/i2c/busses/i2c-nforce2.c| 1 -
>  drivers/i2c/busses/i2c-nomadik.c| 4 +---
>  drivers/i2c/busses/i2c-ocores.c | 4 +---
>  drivers/i2c/busses/i2c-octeon.c | 4 +---
>  drivers/i2c/busses/i2c-omap.c   | 4 +---
>  drivers/i2c/busses/i2c-piix4.c  | 1 -
>  drivers/i2c/busses/i2c-pmcmsp.c | 4 +---
>  drivers/i2c/busses/i2c-pnx.c| 4 +---
>  drivers/i2c/busses/i2c-puv3.c   | 5 +
>  drivers/i2c/busses/i2c-pxa.c| 4 +---
>  drivers/i2c/busses/i2c-rcar.c   | 4 +---
>  drivers/i2c/busses/i2c-riic.c   | 4 +---
>  drivers/i2c/busses/i2c-rk3x.c   | 4 +---
>  drivers/i2c/busses/i2c-s3c2410.c| 1 -
>  drivers/i2c/busses/i2c-sh7760.c | 4 +---
>  drivers/i2c/busses/i2c-sh_mobile.c  | 1 -
>  drivers/i2c/busses/i2c-sirf.c   | 4 +---
>  drivers/i2c/busses/i2c-st.c | 4 +---
>  drivers/i2c/busses/i2c-stu300.c | 5 +
>  drivers/i2c/busses/i2c-tegra.c  | 4 +---
>  drivers/i2c/busses/i2c-uniphier-f.c | 7 +--
>  drivers/i2c/busses/i2c-uniphier.c   | 7 +--
>  drivers/i2c/busses/i2c-wmt.c| 4 +---
>  drivers/i2c/busses/i2c-xgene-slimpro.c  | 1 -
>  drivers/i2c/busses/i2c-xiic.c   | 1 -
>  drivers/i2c/busses/i2c-xlp9xx.c | 4 +---
>  drivers/i2c/busses/i2c-xlr.c| 4 +---
>  55 files changed, 44 insertions(+), 161 deletions(-)
> 
> diff --git a/drivers/i2c/busses/i2c-amd756.c b/drivers/i2c/busses/i2c-amd756.c
> index 6c7113d990f882..274908cd1fdeab 100644
> --- a/drivers/i2c/busses/i2c-amd756.c
> +++ b/drivers/i2c/busses/i2c-amd756.c
> @@ -378,11 +378,8 @@ static int amd756_probe(struct pci_dev *pdev, const 
> struct pci_device_id *id)
>amd756_ioport);
>  
>   error = i2c_add_adapter(_smbus);
> - if (error) {
> - dev_err(>dev,
> - "Adapter registration failed, module not inserted\n");
> + if (error)
>   goto out_err;
> - }
>  
>   return 0;
>  
> diff --git a/drivers/i2c/busses/i2c-at91.c b/drivers/i2c/busses/i2c-at91.c
> index f23372669f770f..03a519d29616d7 100644
> --- a/drivers/i2c/busses/i2c-at91.c
> +++ b/drivers/i2c/busses/i2c-at91.c
> @@ -1118,8 +1118,6 @@ static int at91_twi_probe(struct platform_device *pdev)
>  
>   rc = i2c_add_numbered_adapter(>adapter);
>   if (rc) {
> - dev_err(dev->dev, "Adapter %s registration failed\n",
> - dev->adapter.name);
>   clk_disable_unprepare(dev->clk);
>  
>   pm_runtime_disable(dev->dev);
> diff --git a/drivers/i2c/busses/i2c-axxia.c b/drivers/i2c/busses/i2c-axxia.c
> index c335cc7852f94e..d3bcaf4ab095d0 100644
> --- a/drivers/i2c/busses/i2c-axxia.c
> +++ b/drivers/i2c/busses/i2c-axxia.c
> @@ -558,13 +558,7 @@ static int axxia_i2c_probe(struct platform_device *pdev)
>  
>   platform_set_drvdata(pdev, idev);
>  
> - ret = i2c_add_adapter(>adapter);
> - if (ret) {
> - dev_err(>dev, "failed to add adapter\n");
> - return ret;
> - }
> -
> - return 0;
> + return i2c_add_adapter(>adapter);
>  }
>  
>  static int axxia_i2c_remove(struct platform_device *pdev)
> diff --git a/drivers/i2c/busses/i2c-bcm-iproc.c 
> b/drivers/i2c/busses/i2c-bcm-iproc.c
> index 19c843828fe2ca..8e3477f9297eda 100644

Re: [PATCH] i2c: don't print error when adding adapter fails

2016-08-09 Thread Grygorii Strashko

On 08/09/2016 02:36 PM, Wolfram Sang wrote:

The core will do this for us now.

Signed-off-by: Wolfram Sang 
---


For:

 drivers/i2c/busses/i2c-davinci.c| 4 +---
 drivers/i2c/busses/i2c-omap.c   | 4 +---


Reviewed-by: Grygorii Strashko 


--
regards,
-grygorii


[PATCH] i2c: don't print error when adding adapter fails

2016-08-09 Thread Wolfram Sang
Since v4.8-rc1, the I2C core will print detailed information when adding an I2C
adapter fails. So, drivers can skip this now.

I am still undecided if I apply this as a single patch or break it out. But for
reviewing, avoiding the patch bomb is probably a good thing.

Should go via subsystem tree, I'd think.

Wolfram Sang (1):
  i2c: don't print error when adding adapter fails

 drivers/i2c/busses/i2c-amd756.c | 5 +
 drivers/i2c/busses/i2c-at91.c   | 2 --
 drivers/i2c/busses/i2c-axxia.c  | 8 +---
 drivers/i2c/busses/i2c-bcm-iproc.c  | 8 +---
 drivers/i2c/busses/i2c-bcm-kona.c   | 4 +---
 drivers/i2c/busses/i2c-bfin-twi.c   | 4 +---
 drivers/i2c/busses/i2c-brcmstb.c| 4 +---
 drivers/i2c/busses/i2c-cadence.c| 4 +---
 drivers/i2c/busses/i2c-cpm.c| 4 +---
 drivers/i2c/busses/i2c-cros-ec-tunnel.c | 4 +---
 drivers/i2c/busses/i2c-davinci.c| 4 +---
 drivers/i2c/busses/i2c-diolan-u2c.c | 4 +---
 drivers/i2c/busses/i2c-dln2.c   | 4 +---
 drivers/i2c/busses/i2c-efm32.c  | 1 -
 drivers/i2c/busses/i2c-exynos5.c| 4 +---
 drivers/i2c/busses/i2c-hix5hd2.c| 4 +---
 drivers/i2c/busses/i2c-i801.c   | 1 -
 drivers/i2c/busses/i2c-ibm_iic.c| 4 +---
 drivers/i2c/busses/i2c-img-scb.c| 4 +---
 drivers/i2c/busses/i2c-imx.c| 4 +---
 drivers/i2c/busses/i2c-isch.c   | 4 +---
 drivers/i2c/busses/i2c-ismt.c   | 4 +---
 drivers/i2c/busses/i2c-jz4780.c | 4 +---
 drivers/i2c/busses/i2c-lpc2k.c  | 4 +---
 drivers/i2c/busses/i2c-meson.c  | 1 -
 drivers/i2c/busses/i2c-mpc.c| 4 +---
 drivers/i2c/busses/i2c-mt65xx.c | 4 +---
 drivers/i2c/busses/i2c-mxs.c| 1 -
 drivers/i2c/busses/i2c-nforce2.c| 1 -
 drivers/i2c/busses/i2c-nomadik.c| 4 +---
 drivers/i2c/busses/i2c-ocores.c | 4 +---
 drivers/i2c/busses/i2c-octeon.c | 4 +---
 drivers/i2c/busses/i2c-omap.c   | 4 +---
 drivers/i2c/busses/i2c-piix4.c  | 1 -
 drivers/i2c/busses/i2c-pmcmsp.c | 4 +---
 drivers/i2c/busses/i2c-pnx.c| 4 +---
 drivers/i2c/busses/i2c-puv3.c   | 5 +
 drivers/i2c/busses/i2c-pxa.c| 4 +---
 drivers/i2c/busses/i2c-rcar.c   | 4 +---
 drivers/i2c/busses/i2c-riic.c   | 4 +---
 drivers/i2c/busses/i2c-rk3x.c   | 4 +---
 drivers/i2c/busses/i2c-s3c2410.c| 1 -
 drivers/i2c/busses/i2c-sh7760.c | 4 +---
 drivers/i2c/busses/i2c-sh_mobile.c  | 1 -
 drivers/i2c/busses/i2c-sirf.c   | 4 +---
 drivers/i2c/busses/i2c-st.c | 4 +---
 drivers/i2c/busses/i2c-stu300.c | 5 +
 drivers/i2c/busses/i2c-tegra.c  | 4 +---
 drivers/i2c/busses/i2c-uniphier-f.c | 7 +--
 drivers/i2c/busses/i2c-uniphier.c   | 7 +--
 drivers/i2c/busses/i2c-wmt.c| 4 +---
 drivers/i2c/busses/i2c-xgene-slimpro.c  | 1 -
 drivers/i2c/busses/i2c-xiic.c   | 1 -
 drivers/i2c/busses/i2c-xlp9xx.c | 4 +---
 drivers/i2c/busses/i2c-xlr.c| 4 +---
 55 files changed, 44 insertions(+), 161 deletions(-)

-- 
2.8.1



[PATCH] i2c: don't print error when adding adapter fails

2016-08-09 Thread Wolfram Sang
The core will do this for us now.

Signed-off-by: Wolfram Sang 
---
 drivers/i2c/busses/i2c-amd756.c | 5 +
 drivers/i2c/busses/i2c-at91.c   | 2 --
 drivers/i2c/busses/i2c-axxia.c  | 8 +---
 drivers/i2c/busses/i2c-bcm-iproc.c  | 8 +---
 drivers/i2c/busses/i2c-bcm-kona.c   | 4 +---
 drivers/i2c/busses/i2c-bfin-twi.c   | 4 +---
 drivers/i2c/busses/i2c-brcmstb.c| 4 +---
 drivers/i2c/busses/i2c-cadence.c| 4 +---
 drivers/i2c/busses/i2c-cpm.c| 4 +---
 drivers/i2c/busses/i2c-cros-ec-tunnel.c | 4 +---
 drivers/i2c/busses/i2c-davinci.c| 4 +---
 drivers/i2c/busses/i2c-diolan-u2c.c | 4 +---
 drivers/i2c/busses/i2c-dln2.c   | 4 +---
 drivers/i2c/busses/i2c-efm32.c  | 1 -
 drivers/i2c/busses/i2c-exynos5.c| 4 +---
 drivers/i2c/busses/i2c-hix5hd2.c| 4 +---
 drivers/i2c/busses/i2c-i801.c   | 1 -
 drivers/i2c/busses/i2c-ibm_iic.c| 4 +---
 drivers/i2c/busses/i2c-img-scb.c| 4 +---
 drivers/i2c/busses/i2c-imx.c| 4 +---
 drivers/i2c/busses/i2c-isch.c   | 4 +---
 drivers/i2c/busses/i2c-ismt.c   | 4 +---
 drivers/i2c/busses/i2c-jz4780.c | 4 +---
 drivers/i2c/busses/i2c-lpc2k.c  | 4 +---
 drivers/i2c/busses/i2c-meson.c  | 1 -
 drivers/i2c/busses/i2c-mpc.c| 4 +---
 drivers/i2c/busses/i2c-mt65xx.c | 4 +---
 drivers/i2c/busses/i2c-mxs.c| 1 -
 drivers/i2c/busses/i2c-nforce2.c| 1 -
 drivers/i2c/busses/i2c-nomadik.c| 4 +---
 drivers/i2c/busses/i2c-ocores.c | 4 +---
 drivers/i2c/busses/i2c-octeon.c | 4 +---
 drivers/i2c/busses/i2c-omap.c   | 4 +---
 drivers/i2c/busses/i2c-piix4.c  | 1 -
 drivers/i2c/busses/i2c-pmcmsp.c | 4 +---
 drivers/i2c/busses/i2c-pnx.c| 4 +---
 drivers/i2c/busses/i2c-puv3.c   | 5 +
 drivers/i2c/busses/i2c-pxa.c| 4 +---
 drivers/i2c/busses/i2c-rcar.c   | 4 +---
 drivers/i2c/busses/i2c-riic.c   | 4 +---
 drivers/i2c/busses/i2c-rk3x.c   | 4 +---
 drivers/i2c/busses/i2c-s3c2410.c| 1 -
 drivers/i2c/busses/i2c-sh7760.c | 4 +---
 drivers/i2c/busses/i2c-sh_mobile.c  | 1 -
 drivers/i2c/busses/i2c-sirf.c   | 4 +---
 drivers/i2c/busses/i2c-st.c | 4 +---
 drivers/i2c/busses/i2c-stu300.c | 5 +
 drivers/i2c/busses/i2c-tegra.c  | 4 +---
 drivers/i2c/busses/i2c-uniphier-f.c | 7 +--
 drivers/i2c/busses/i2c-uniphier.c   | 7 +--
 drivers/i2c/busses/i2c-wmt.c| 4 +---
 drivers/i2c/busses/i2c-xgene-slimpro.c  | 1 -
 drivers/i2c/busses/i2c-xiic.c   | 1 -
 drivers/i2c/busses/i2c-xlp9xx.c | 4 +---
 drivers/i2c/busses/i2c-xlr.c| 4 +---
 55 files changed, 44 insertions(+), 161 deletions(-)

diff --git a/drivers/i2c/busses/i2c-amd756.c b/drivers/i2c/busses/i2c-amd756.c
index 6c7113d990f882..274908cd1fdeab 100644
--- a/drivers/i2c/busses/i2c-amd756.c
+++ b/drivers/i2c/busses/i2c-amd756.c
@@ -378,11 +378,8 @@ static int amd756_probe(struct pci_dev *pdev, const struct 
pci_device_id *id)
 amd756_ioport);
 
error = i2c_add_adapter(_smbus);
-   if (error) {
-   dev_err(>dev,
-   "Adapter registration failed, module not inserted\n");
+   if (error)
goto out_err;
-   }
 
return 0;
 
diff --git a/drivers/i2c/busses/i2c-at91.c b/drivers/i2c/busses/i2c-at91.c
index f23372669f770f..03a519d29616d7 100644
--- a/drivers/i2c/busses/i2c-at91.c
+++ b/drivers/i2c/busses/i2c-at91.c
@@ -1118,8 +1118,6 @@ static int at91_twi_probe(struct platform_device *pdev)
 
rc = i2c_add_numbered_adapter(>adapter);
if (rc) {
-   dev_err(dev->dev, "Adapter %s registration failed\n",
-   dev->adapter.name);
clk_disable_unprepare(dev->clk);
 
pm_runtime_disable(dev->dev);
diff --git a/drivers/i2c/busses/i2c-axxia.c b/drivers/i2c/busses/i2c-axxia.c
index c335cc7852f94e..d3bcaf4ab095d0 100644
--- a/drivers/i2c/busses/i2c-axxia.c
+++ b/drivers/i2c/busses/i2c-axxia.c
@@ -558,13 +558,7 @@ static int axxia_i2c_probe(struct platform_device *pdev)
 
platform_set_drvdata(pdev, idev);
 
-   ret = i2c_add_adapter(>adapter);
-   if (ret) {
-   dev_err(>dev, "failed to add adapter\n");
-   return ret;
-   }
-
-   return 0;
+   return i2c_add_adapter(>adapter);
 }
 
 static int axxia_i2c_remove(struct platform_device *pdev)
diff --git a/drivers/i2c/busses/i2c-bcm-iproc.c 
b/drivers/i2c/busses/i2c-bcm-iproc.c
index 19c843828fe2ca..8e3477f9297eda 100644
--- a/drivers/i2c/busses/i2c-bcm-iproc.c
+++ b/drivers/i2c/busses/i2c-bcm-iproc.c
@@ -488,13 +488,7 @@ static int bcm_iproc_i2c_probe(struct platform_device 
*pdev)
adap->dev.parent = >dev;
adap->dev.of_node = pdev->dev.of_node;

Re: [PATCH] i2c: don't print error when adding adapter fails

2016-08-09 Thread Guenter Roeck

On 08/09/2016 04:36 AM, Wolfram Sang wrote:

The core will do this for us now.

Signed-off-by: Wolfram Sang 
---

[ ... ]


diff --git a/drivers/i2c/busses/i2c-uniphier-f.c 
b/drivers/i2c/busses/i2c-uniphier-f.c
index aeead0d27d1007..64318e69089439 100644
--- a/drivers/i2c/busses/i2c-uniphier-f.c
+++ b/drivers/i2c/busses/i2c-uniphier-f.c
@@ -550,15 +550,10 @@ static int uniphier_fi2c_probe(struct platform_device 
*pdev)
}

ret = i2c_add_adapter(>adap);
-   if (ret) {
-   dev_err(dev, "failed to add I2C adapter\n");
-   goto err;
-   }
-
-err:
if (ret)
clk_disable_unprepare(priv->clk);

+ err:


You sure about that one ? It leaves the clock enabled in some of the error 
paths.


return ret;
 }

diff --git a/drivers/i2c/busses/i2c-uniphier.c 
b/drivers/i2c/busses/i2c-uniphier.c
index 475a5eb514e215..94f64cccfdef08 100644
--- a/drivers/i2c/busses/i2c-uniphier.c
+++ b/drivers/i2c/busses/i2c-uniphier.c
@@ -407,15 +407,10 @@ static int uniphier_i2c_probe(struct platform_device 
*pdev)
}

ret = i2c_add_adapter(>adap);
-   if (ret) {
-   dev_err(dev, "failed to add I2C adapter\n");
-   goto err;
-   }
-
-err:
if (ret)
clk_disable_unprepare(priv->clk);

+ err:


Same as above.

Note: I dropped all individuals from Cc:; my mailer refused to accept the reply 
because there
were too many.

Guenter


return ret;
 }





Re: [PATCH] i2c: don't print error when adding adapter fails

2016-08-09 Thread Thierry Reding
On Tue, Aug 09, 2016 at 01:36:17PM +0200, Wolfram Sang wrote:
[...]
> diff --git a/drivers/i2c/busses/i2c-tegra.c b/drivers/i2c/busses/i2c-tegra.c
> index b126dbaa47e370..d9979da11485ae 100644
> --- a/drivers/i2c/busses/i2c-tegra.c
> +++ b/drivers/i2c/busses/i2c-tegra.c
> @@ -932,10 +932,8 @@ static int tegra_i2c_probe(struct platform_device *pdev)
>   i2c_dev->adapter.dev.of_node = pdev->dev.of_node;
>  
>   ret = i2c_add_numbered_adapter(_dev->adapter);
> - if (ret) {
> - dev_err(>dev, "Failed to add I2C adapter\n");
> + if (ret)
>   goto disable_div_clk;
> - }
>  
>   return 0;
>  

Acked-by: Thierry Reding 


signature.asc
Description: PGP signature


Re: [PATCH] i2c: don't print error when adding adapter fails

2016-08-09 Thread Heiko Stübner
Am Dienstag, 9. August 2016, 13:36:17 schrieb Wolfram Sang:
> The core will do this for us now.
> 
> Signed-off-by: Wolfram Sang 
> ---

[...]

> diff --git a/drivers/i2c/busses/i2c-rk3x.c b/drivers/i2c/busses/i2c-rk3x.c
> index 2bc8b01153d619..3b87afe82f6394 100644
> --- a/drivers/i2c/busses/i2c-rk3x.c
> +++ b/drivers/i2c/busses/i2c-rk3x.c
> @@ -1303,10 +1303,8 @@ static int rk3x_i2c_probe(struct platform_device
> *pdev) rk3x_i2c_adapt_div(i2c, clk_rate);
> 
>   ret = i2c_add_adapter(>adap);
> - if (ret < 0) {
> - dev_err(>dev, "Could not register adapter\n");
> + if (ret < 0)
>   goto err_clk_notifier;
> - }
> 
>   dev_info(>dev, "Initialized RK3xxx I2C bus at %p\n", i2c->regs);

for Rockchip
Acked-by: Heiko Stuebner 


Re: [PATCH] i2c: don't print error when adding adapter fails

2016-08-09 Thread Uwe Kleine-König
Hello Wolfram,

On Tue, Aug 09, 2016 at 01:36:17PM +0200, Wolfram Sang wrote:
> The core will do this for us now.

Would be nice to point out the relevant commit that changed the core in
the commit log.

Best regards
Uwe

-- 
Pengutronix e.K.   | Uwe Kleine-König|
Industrial Linux Solutions | http://www.pengutronix.de/  |


Re: [PATCH] i2c: don't print error when adding adapter fails

2016-08-09 Thread Peter Korsgaard
> "Wolfram" == Wolfram Sang  writes:

 > The core will do this for us now.
 > Signed-off-by: Wolfram Sang 
 > ---
 >  drivers/i2c/busses/i2c-ocores.c | 4 +---

For i2c-ocores.c:

Acked-by: Peter Korsgaard 

-- 
Bye, Peter Korsgaard