[PATCH 0/4] media: don't check retval after our own assignment

[PATCH 0/4] media: don't check retval after our own assignment

[Wolfram Sang]

Interesting how many cleanups I find until I can start the
refactorization I really want :) This series fixes a set of unneeded if
checks following the assignment of an errno constant.

Only build tested due to no HW.

Wolfram Sang (4):
  media: cxd2820r_core: don't check retval after our own assignemt
  media: mn88472: don't check retval after our own assignemt
  media: mn88473: don't check retval after our own assignemt
  media: zd1301_demod: don't check retval after our own assignemt

 drivers/media/dvb-frontends/cxd2820r_core.c | 3 +--
 drivers/media/dvb-frontends/mn88472.c       | 6 ++----
 drivers/media/dvb-frontends/mn88473.c       | 6 ++----
 drivers/media/dvb-frontends/zd1301_demod.c  | 3 +--
 4 files changed, 6 insertions(+), 12 deletions(-)

-- 
2.20.1

[PATCH 1/4] media: cxd2820r: don't check retval after our own assignemt

[Wolfram Sang]

No need to check a retval after we assigned a constant to it.

Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
---
 drivers/media/dvb-frontends/cxd2820r_core.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/media/dvb-frontends/cxd2820r_core.c b/drivers/media/dvb-frontends/cxd2820r_core.c
index 1f006f8e8cc2..99a186ddddb2 100644
--- a/drivers/media/dvb-frontends/cxd2820r_core.c
+++ b/drivers/media/dvb-frontends/cxd2820r_core.c
@@ -636,8 +636,7 @@ static int cxd2820r_probe(struct i2c_client *client,
 	if (!priv->client[1]) {
 		ret = -ENODEV;
 		dev_err(&client->dev, "I2C registration failed\n");
-		if (ret)
-			goto err_regmap_0_regmap_exit;
+		goto err_regmap_0_regmap_exit;
 	}
 
 	priv->regmap[1] = regmap_init_i2c(priv->client[1], &regmap_config1);
-- 
2.20.1

[PATCH 2/4] media: mn88472: don't check retval after our own assignemt

[Wolfram Sang]

No need to check a retval after we assigned a constant to it.

Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
---
 drivers/media/dvb-frontends/mn88472.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/media/dvb-frontends/mn88472.c b/drivers/media/dvb-frontends/mn88472.c
index 731b44b9b74c..0a4d0d5fb4b6 100644
--- a/drivers/media/dvb-frontends/mn88472.c
+++ b/drivers/media/dvb-frontends/mn88472.c
@@ -616,8 +616,7 @@ static int mn88472_probe(struct i2c_client *client,
 	if (!dev->client[1]) {
 		ret = -ENODEV;
 		dev_err(&client->dev, "I2C registration failed\n");
-		if (ret)
-			goto err_regmap_0_regmap_exit;
+		goto err_regmap_0_regmap_exit;
 	}
 	dev->regmap[1] = regmap_init_i2c(dev->client[1], &regmap_config);
 	if (IS_ERR(dev->regmap[1])) {
@@ -630,8 +629,7 @@ static int mn88472_probe(struct i2c_client *client,
 	if (!dev->client[2]) {
 		ret = -ENODEV;
 		dev_err(&client->dev, "2nd I2C registration failed\n");
-		if (ret)
-			goto err_regmap_1_regmap_exit;
+		goto err_regmap_1_regmap_exit;
 	}
 	dev->regmap[2] = regmap_init_i2c(dev->client[2], &regmap_config);
 	if (IS_ERR(dev->regmap[2])) {
-- 
2.20.1

[PATCH 3/4] media: mn88473: don't check retval after our own assignemt

[Wolfram Sang]

No need to check a retval after we assigned a constant to it.

Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
---
 drivers/media/dvb-frontends/mn88473.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/media/dvb-frontends/mn88473.c b/drivers/media/dvb-frontends/mn88473.c
index 08118b38533b..d1b11909825c 100644
--- a/drivers/media/dvb-frontends/mn88473.c
+++ b/drivers/media/dvb-frontends/mn88473.c
@@ -661,8 +661,7 @@ static int mn88473_probe(struct i2c_client *client,
 	if (dev->client[1] == NULL) {
 		ret = -ENODEV;
 		dev_err(&client->dev, "I2C registration failed\n");
-		if (ret)
-			goto err_regmap_0_regmap_exit;
+		goto err_regmap_0_regmap_exit;
 	}
 	dev->regmap[1] = regmap_init_i2c(dev->client[1], &regmap_config);
 	if (IS_ERR(dev->regmap[1])) {
@@ -675,8 +674,7 @@ static int mn88473_probe(struct i2c_client *client,
 	if (dev->client[2] == NULL) {
 		ret = -ENODEV;
 		dev_err(&client->dev, "2nd I2C registration failed\n");
-		if (ret)
-			goto err_regmap_1_regmap_exit;
+		goto err_regmap_1_regmap_exit;
 	}
 	dev->regmap[2] = regmap_init_i2c(dev->client[2], &regmap_config);
 	if (IS_ERR(dev->regmap[2])) {
-- 
2.20.1

[PATCH 4/4] media: zd1301_demod: don't check retval after our own assignemt

[Wolfram Sang]

No need to check a retval after we assigned a constant to it.

Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
---
 drivers/media/dvb-frontends/zd1301_demod.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/media/dvb-frontends/zd1301_demod.c b/drivers/media/dvb-frontends/zd1301_demod.c
index 96adbba7a82b..bbabe6a2d4f4 100644
--- a/drivers/media/dvb-frontends/zd1301_demod.c
+++ b/drivers/media/dvb-frontends/zd1301_demod.c
@@ -421,8 +421,7 @@ static int zd1301_demod_i2c_master_xfer(struct i2c_adapter *adapter,
 	} else {
 		dev_dbg(&pdev->dev, "unknown msg[0].len=%u\n", msg[0].len);
 		ret = -EOPNOTSUPP;
-		if (ret)
-			goto err;
+		goto err;
 	}
 
 	return num;
-- 
2.20.1

Re: [PATCH 1/4] media: cxd2820r: don't check retval after our own assignemt

[Kieran Bingham]

Hi Wolfram,


In the title/subject:

media: cxd2820r: don't check retval after our own assignemt

s/assignemt/assignment/


On 13/06/2019 16:54, Wolfram Sang wrote:
> No need to check a retval after we assigned a constant to it.

Hrm... Good spots!

> Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
> ---
>  drivers/media/dvb-frontends/cxd2820r_core.c | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/drivers/media/dvb-frontends/cxd2820r_core.c b/drivers/media/dvb-frontends/cxd2820r_core.c
> index 1f006f8e8cc2..99a186ddddb2 100644
> --- a/drivers/media/dvb-frontends/cxd2820r_core.c
> +++ b/drivers/media/dvb-frontends/cxd2820r_core.c
> @@ -636,8 +636,7 @@ static int cxd2820r_probe(struct i2c_client *client,
>  	if (!priv->client[1]) {
>  		ret = -ENODEV;
>  		dev_err(&client->dev, "I2C registration failed\n");
> -		if (ret)

Can't argue with that.

Reviewed-by: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>

> -			goto err_regmap_0_regmap_exit;
> +		goto err_regmap_0_regmap_exit;
>  	}
>  
>  	priv->regmap[1] = regmap_init_i2c(priv->client[1], &regmap_config1);
> 

Re: [PATCH 2/4] media: mn88472: don't check retval after our own assignemt

[Kieran Bingham]

Hi Wolfram,

Same comment in title (on all 4 patches in fact)
	s/assignemt/assignment/


On 13/06/2019 16:54, Wolfram Sang wrote:
> No need to check a retval after we assigned a constant to it.
> 
> Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
> ---
>  drivers/media/dvb-frontends/mn88472.c | 6 ++----
>  1 file changed, 2 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/media/dvb-frontends/mn88472.c b/drivers/media/dvb-frontends/mn88472.c
> index 731b44b9b74c..0a4d0d5fb4b6 100644
> --- a/drivers/media/dvb-frontends/mn88472.c
> +++ b/drivers/media/dvb-frontends/mn88472.c
> @@ -616,8 +616,7 @@ static int mn88472_probe(struct i2c_client *client,
>  	if (!dev->client[1]) {
>  		ret = -ENODEV;
>  		dev_err(&client->dev, "I2C registration failed\n");
> -		if (ret)
> -			goto err_regmap_0_regmap_exit;
> +		goto err_regmap_0_regmap_exit;

Ack

>  	}
>  	dev->regmap[1] = regmap_init_i2c(dev->client[1], &regmap_config);
>  	if (IS_ERR(dev->regmap[1])) {
> @@ -630,8 +629,7 @@ static int mn88472_probe(struct i2c_client *client,
>  	if (!dev->client[2]) {
>  		ret = -ENODEV;
>  		dev_err(&client->dev, "2nd I2C registration failed\n");
> -		if (ret)
> -			goto err_regmap_1_regmap_exit;
> +		goto err_regmap_1_regmap_exit;

Ack.

Reviewed-by: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>

>  	}
>  	dev->regmap[2] = regmap_init_i2c(dev->client[2], &regmap_config);
>  	if (IS_ERR(dev->regmap[2])) {
> 

Re: [PATCH 3/4] media: mn88473: don't check retval after our own assignemt

[Kieran Bingham]

Hi Wolfram,

On 13/06/2019 16:54, Wolfram Sang wrote:
> No need to check a retval after we assigned a constant to it.
> 
> Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>

With title fixed.

Reviewed-by: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>

> ---
>  drivers/media/dvb-frontends/mn88473.c | 6 ++----
>  1 file changed, 2 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/media/dvb-frontends/mn88473.c b/drivers/media/dvb-frontends/mn88473.c
> index 08118b38533b..d1b11909825c 100644
> --- a/drivers/media/dvb-frontends/mn88473.c
> +++ b/drivers/media/dvb-frontends/mn88473.c
> @@ -661,8 +661,7 @@ static int mn88473_probe(struct i2c_client *client,
>  	if (dev->client[1] == NULL) {
>  		ret = -ENODEV;
>  		dev_err(&client->dev, "I2C registration failed\n");
> -		if (ret)
> -			goto err_regmap_0_regmap_exit;
> +		goto err_regmap_0_regmap_exit;
>  	}
>  	dev->regmap[1] = regmap_init_i2c(dev->client[1], &regmap_config);
>  	if (IS_ERR(dev->regmap[1])) {
> @@ -675,8 +674,7 @@ static int mn88473_probe(struct i2c_client *client,
>  	if (dev->client[2] == NULL) {
>  		ret = -ENODEV;
>  		dev_err(&client->dev, "2nd I2C registration failed\n");
> -		if (ret)
> -			goto err_regmap_1_regmap_exit;
> +		goto err_regmap_1_regmap_exit;
>  	}
>  	dev->regmap[2] = regmap_init_i2c(dev->client[2], &regmap_config);
>  	if (IS_ERR(dev->regmap[2])) {
> 

Re: [PATCH 4/4] media: zd1301_demod: don't check retval after our own assignemt

[Kieran Bingham]

Hi Wolfram,

On 13/06/2019 16:54, Wolfram Sang wrote:
> No need to check a retval after we assigned a constant to it.

With title fixed,

Reviewed-by: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>

> 
> Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
> ---
>  drivers/media/dvb-frontends/zd1301_demod.c | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/drivers/media/dvb-frontends/zd1301_demod.c b/drivers/media/dvb-frontends/zd1301_demod.c
> index 96adbba7a82b..bbabe6a2d4f4 100644
> --- a/drivers/media/dvb-frontends/zd1301_demod.c
> +++ b/drivers/media/dvb-frontends/zd1301_demod.c
> @@ -421,8 +421,7 @@ static int zd1301_demod_i2c_master_xfer(struct i2c_adapter *adapter,
>  	} else {
>  		dev_dbg(&pdev->dev, "unknown msg[0].len=%u\n", msg[0].len);
>  		ret = -EOPNOTSUPP;
> -		if (ret)
> -			goto err;
> +		goto err;
>  	}
>  
>  	return num;
> 

Re: [PATCH 1/4] media: cxd2820r: don't check retval after our own assignemt

[Wolfram Sang]

[-- Attachment #1: Type: text/plain, Size: 185 bytes --]


> In the title/subject:
> 
> media: cxd2820r: don't check retval after our own assignemt
> 
> s/assignemt/assignment/

Eeeks, in deed :( Shall I resend? Sorry for the noise.


[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

Re: [PATCH 1/4] media: cxd2820r: don't check retval after our own assignemt

[Kieran Bingham]

Hi Wolfram,

On 13/06/2019 17:19, Wolfram Sang wrote:
> 
>> In the title/subject:
>>
>> media: cxd2820r: don't check retval after our own assignemt
>>
>> s/assignemt/assignment/
> 
> Eeeks, in deed :( Shall I resend? Sorry for the noise.
> 

Not necessary for me, so I guess that's up to Mauro/Hans.
Not sure who will pick these up and apply them.
--
Kieran