* [PATCH] i2c: uniphier{-f}: don't print error when adding adapter fails
@ 2016-08-09 20:11 Wolfram Sang
2016-08-10 0:54 ` Masahiro Yamada
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Wolfram Sang @ 2016-08-09 20:11 UTC (permalink / raw)
To: linux-kernel; +Cc: linux-i2c, Masahiro Yamada, Guenter Roeck, Wolfram Sang
The core will do this for us now.
Signed-off-by: Wolfram Sang <wsa-dev@sang-engineering.com>
---
drivers/i2c/busses/i2c-uniphier-f.c | 5 -----
drivers/i2c/busses/i2c-uniphier.c | 5 -----
2 files changed, 10 deletions(-)
diff --git a/drivers/i2c/busses/i2c-uniphier-f.c b/drivers/i2c/busses/i2c-uniphier-f.c
index aeead0d27d1007..35608531fe070d 100644
--- a/drivers/i2c/busses/i2c-uniphier-f.c
+++ b/drivers/i2c/busses/i2c-uniphier-f.c
@@ -550,11 +550,6 @@ static int uniphier_fi2c_probe(struct platform_device *pdev)
}
ret = i2c_add_adapter(&priv->adap);
- if (ret) {
- dev_err(dev, "failed to add I2C adapter\n");
- goto err;
- }
-
err:
if (ret)
clk_disable_unprepare(priv->clk);
diff --git a/drivers/i2c/busses/i2c-uniphier.c b/drivers/i2c/busses/i2c-uniphier.c
index 475a5eb514e215..d6e612a0e02a9d 100644
--- a/drivers/i2c/busses/i2c-uniphier.c
+++ b/drivers/i2c/busses/i2c-uniphier.c
@@ -407,11 +407,6 @@ static int uniphier_i2c_probe(struct platform_device *pdev)
}
ret = i2c_add_adapter(&priv->adap);
- if (ret) {
- dev_err(dev, "failed to add I2C adapter\n");
- goto err;
- }
-
err:
if (ret)
clk_disable_unprepare(priv->clk);
--
2.8.1
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] i2c: uniphier{-f}: don't print error when adding adapter fails
2016-08-09 20:11 [PATCH] i2c: uniphier{-f}: don't print error when adding adapter fails Wolfram Sang
@ 2016-08-10 0:54 ` Masahiro Yamada
2016-08-10 1:25 ` Guenter Roeck
2016-08-14 22:17 ` Wolfram Sang
2 siblings, 0 replies; 4+ messages in thread
From: Masahiro Yamada @ 2016-08-10 0:54 UTC (permalink / raw)
To: Wolfram Sang; +Cc: Linux Kernel Mailing List, linux-i2c, Guenter Roeck
2016-08-10 5:11 GMT+09:00 Wolfram Sang <wsa-dev@sang-engineering.com>:
> The core will do this for us now.
>
> Signed-off-by: Wolfram Sang <wsa-dev@sang-engineering.com>
> ---
> drivers/i2c/busses/i2c-uniphier-f.c | 5 -----
> drivers/i2c/busses/i2c-uniphier.c | 5 -----
> 2 files changed, 10 deletions(-)
>
> diff --git a/drivers/i2c/busses/i2c-uniphier-f.c b/drivers/i2c/busses/i2c-uniphier-f.c
> index aeead0d27d1007..35608531fe070d 100644
> --- a/drivers/i2c/busses/i2c-uniphier-f.c
> +++ b/drivers/i2c/busses/i2c-uniphier-f.c
> @@ -550,11 +550,6 @@ static int uniphier_fi2c_probe(struct platform_device *pdev)
> }
>
> ret = i2c_add_adapter(&priv->adap);
> - if (ret) {
> - dev_err(dev, "failed to add I2C adapter\n");
> - goto err;
> - }
> -
> err:
> if (ret)
> clk_disable_unprepare(priv->clk);
> diff --git a/drivers/i2c/busses/i2c-uniphier.c b/drivers/i2c/busses/i2c-uniphier.c
> index 475a5eb514e215..d6e612a0e02a9d 100644
> --- a/drivers/i2c/busses/i2c-uniphier.c
> +++ b/drivers/i2c/busses/i2c-uniphier.c
> @@ -407,11 +407,6 @@ static int uniphier_i2c_probe(struct platform_device *pdev)
> }
>
> ret = i2c_add_adapter(&priv->adap);
> - if (ret) {
> - dev_err(dev, "failed to add I2C adapter\n");
> - goto err;
> - }
> -
> err:
> if (ret)
> clk_disable_unprepare(priv->clk);
This version looks good to me. :)
Acked-by: Masahiro Yamada <yamada.masahiro@socionext.com>
(Please make sure to squash this and the other big one into a single patch.)
--
Best Regards
Masahiro Yamada
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] i2c: uniphier{-f}: don't print error when adding adapter fails
2016-08-09 20:11 [PATCH] i2c: uniphier{-f}: don't print error when adding adapter fails Wolfram Sang
2016-08-10 0:54 ` Masahiro Yamada
@ 2016-08-10 1:25 ` Guenter Roeck
2016-08-14 22:17 ` Wolfram Sang
2 siblings, 0 replies; 4+ messages in thread
From: Guenter Roeck @ 2016-08-10 1:25 UTC (permalink / raw)
To: Wolfram Sang; +Cc: linux-kernel, linux-i2c, Masahiro Yamada
On Tue, Aug 09, 2016 at 10:11:40PM +0200, Wolfram Sang wrote:
> The core will do this for us now.
>
> Signed-off-by: Wolfram Sang <wsa-dev@sang-engineering.com>
Acked-by: Guenter Roeck <linux@roeck-us.net>
> ---
> drivers/i2c/busses/i2c-uniphier-f.c | 5 -----
> drivers/i2c/busses/i2c-uniphier.c | 5 -----
> 2 files changed, 10 deletions(-)
>
> diff --git a/drivers/i2c/busses/i2c-uniphier-f.c b/drivers/i2c/busses/i2c-uniphier-f.c
> index aeead0d27d1007..35608531fe070d 100644
> --- a/drivers/i2c/busses/i2c-uniphier-f.c
> +++ b/drivers/i2c/busses/i2c-uniphier-f.c
> @@ -550,11 +550,6 @@ static int uniphier_fi2c_probe(struct platform_device *pdev)
> }
>
> ret = i2c_add_adapter(&priv->adap);
> - if (ret) {
> - dev_err(dev, "failed to add I2C adapter\n");
> - goto err;
> - }
> -
> err:
> if (ret)
> clk_disable_unprepare(priv->clk);
> diff --git a/drivers/i2c/busses/i2c-uniphier.c b/drivers/i2c/busses/i2c-uniphier.c
> index 475a5eb514e215..d6e612a0e02a9d 100644
> --- a/drivers/i2c/busses/i2c-uniphier.c
> +++ b/drivers/i2c/busses/i2c-uniphier.c
> @@ -407,11 +407,6 @@ static int uniphier_i2c_probe(struct platform_device *pdev)
> }
>
> ret = i2c_add_adapter(&priv->adap);
> - if (ret) {
> - dev_err(dev, "failed to add I2C adapter\n");
> - goto err;
> - }
> -
> err:
> if (ret)
> clk_disable_unprepare(priv->clk);
> --
> 2.8.1
>
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] i2c: uniphier{-f}: don't print error when adding adapter fails
2016-08-09 20:11 [PATCH] i2c: uniphier{-f}: don't print error when adding adapter fails Wolfram Sang
2016-08-10 0:54 ` Masahiro Yamada
2016-08-10 1:25 ` Guenter Roeck
@ 2016-08-14 22:17 ` Wolfram Sang
2 siblings, 0 replies; 4+ messages in thread
From: Wolfram Sang @ 2016-08-14 22:17 UTC (permalink / raw)
To: Wolfram Sang; +Cc: linux-kernel, linux-i2c, Masahiro Yamada, Guenter Roeck
[-- Attachment #1: Type: text/plain, Size: 200 bytes --]
On Tue, Aug 09, 2016 at 10:11:40PM +0200, Wolfram Sang wrote:
> The core will do this for us now.
>
> Signed-off-by: Wolfram Sang <wsa-dev@sang-engineering.com>
Applied to for-next, thanks!
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2016-08-14 22:17 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-08-09 20:11 [PATCH] i2c: uniphier{-f}: don't print error when adding adapter fails Wolfram Sang
2016-08-10 0:54 ` Masahiro Yamada
2016-08-10 1:25 ` Guenter Roeck
2016-08-14 22:17 ` Wolfram Sang
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).