2019-06-13 15:56:41

by Wolfram Sang

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

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


2019-06-13 15:56:43

by Wolfram Sang

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

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

Signed-off-by: Wolfram Sang <[email protected]>
---
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

2019-06-13 15:57:05

by Wolfram Sang

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

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

Signed-off-by: Wolfram Sang <[email protected]>
---
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

2019-06-13 16:11:03

by Kieran Bingham

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

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 <[email protected]>
> ---
> 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 <[email protected]>

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

2019-06-13 16:15:07

by Kieran Bingham

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

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 <[email protected]>

>
> Signed-off-by: Wolfram Sang <[email protected]>
> ---
> 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;
>

2019-06-13 16:20:34

by Wolfram Sang

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


> 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.


Attachments:
(No filename) (185.00 B)
signature.asc (849.00 B)
Download all attachments

2019-06-13 16:36:25

by Kieran Bingham

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

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