From patchwork Thu Jun 13 15:54:17 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfram Sang X-Patchwork-Id: 56900 X-Patchwork-Delegate: hverkuil@xs4all.nl Received: from vger.kernel.org ([209.132.180.67]) by www.linuxtv.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hbS3x-0002Ng-Uv; Thu, 13 Jun 2019 15:54:54 +0000 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387951AbfFMPyw (ORCPT + 1 other); Thu, 13 Jun 2019 11:54:52 -0400 Received: from sauhun.de ([88.99.104.3]:41922 "EHLO pokefinder.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390076AbfFMPy0 (ORCPT ); Thu, 13 Jun 2019 11:54:26 -0400 Received: from localhost (p5486CF99.dip0.t-ipconnect.de [84.134.207.153]) by pokefinder.org (Postfix) with ESMTPSA id 4BA5D4A1290; Thu, 13 Jun 2019 17:54:24 +0200 (CEST) From: Wolfram Sang To: linux-media@vger.kernel.org Cc: linux-renesas-soc@vger.kernel.org, Wolfram Sang , Antti Palosaari , Mauro Carvalho Chehab , linux-kernel@vger.kernel.org Subject: [PATCH 1/4] media: cxd2820r: don't check retval after our own assignemt Date: Thu, 13 Jun 2019 17:54:17 +0200 Message-Id: <20190613155421.16408-2-wsa+renesas@sang-engineering.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190613155421.16408-1-wsa+renesas@sang-engineering.com> References: <20190613155421.16408-1-wsa+renesas@sang-engineering.com> MIME-Version: 1.0 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org No need to check a retval after we assigned a constant to it. Signed-off-by: Wolfram Sang Reviewed-by: Kieran Bingham --- 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], ®map_config1); From patchwork Thu Jun 13 15:54:18 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfram Sang X-Patchwork-Id: 56899 X-Patchwork-Delegate: hverkuil@xs4all.nl Received: from vger.kernel.org ([209.132.180.67]) by www.linuxtv.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hbS3l-0002MD-Sz; Thu, 13 Jun 2019 15:54:42 +0000 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726838AbfFMPyk (ORCPT + 1 other); Thu, 13 Jun 2019 11:54:40 -0400 Received: from sauhun.de ([88.99.104.3]:41930 "EHLO pokefinder.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390084AbfFMPy0 (ORCPT ); Thu, 13 Jun 2019 11:54:26 -0400 Received: from localhost (p5486CF99.dip0.t-ipconnect.de [84.134.207.153]) by pokefinder.org (Postfix) with ESMTPSA id DDE0F4A129C; Thu, 13 Jun 2019 17:54:24 +0200 (CEST) From: Wolfram Sang To: linux-media@vger.kernel.org Cc: linux-renesas-soc@vger.kernel.org, Wolfram Sang , Antti Palosaari , Mauro Carvalho Chehab , linux-kernel@vger.kernel.org Subject: [PATCH 2/4] media: mn88472: don't check retval after our own assignemt Date: Thu, 13 Jun 2019 17:54:18 +0200 Message-Id: <20190613155421.16408-3-wsa+renesas@sang-engineering.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190613155421.16408-1-wsa+renesas@sang-engineering.com> References: <20190613155421.16408-1-wsa+renesas@sang-engineering.com> MIME-Version: 1.0 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org No need to check a retval after we assigned a constant to it. Signed-off-by: Wolfram Sang Reviewed-by: Kieran Bingham --- 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], ®map_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], ®map_config); if (IS_ERR(dev->regmap[2])) { From patchwork Thu Jun 13 15:54:19 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfram Sang X-Patchwork-Id: 56898 X-Patchwork-Delegate: hverkuil@xs4all.nl Received: from vger.kernel.org ([209.132.180.67]) by www.linuxtv.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hbS3k-0002MD-UW; Thu, 13 Jun 2019 15:54:41 +0000 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732888AbfFMPyj (ORCPT + 1 other); Thu, 13 Jun 2019 11:54:39 -0400 Received: from sauhun.de ([88.99.104.3]:41940 "EHLO pokefinder.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731773AbfFMPy1 (ORCPT ); Thu, 13 Jun 2019 11:54:27 -0400 Received: from localhost (p5486CF99.dip0.t-ipconnect.de [84.134.207.153]) by pokefinder.org (Postfix) with ESMTPSA id 6F2F24A12AA; Thu, 13 Jun 2019 17:54:25 +0200 (CEST) From: Wolfram Sang To: linux-media@vger.kernel.org Cc: linux-renesas-soc@vger.kernel.org, Wolfram Sang , Antti Palosaari , Mauro Carvalho Chehab , linux-kernel@vger.kernel.org Subject: [PATCH 3/4] media: mn88473: don't check retval after our own assignemt Date: Thu, 13 Jun 2019 17:54:19 +0200 Message-Id: <20190613155421.16408-4-wsa+renesas@sang-engineering.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190613155421.16408-1-wsa+renesas@sang-engineering.com> References: <20190613155421.16408-1-wsa+renesas@sang-engineering.com> MIME-Version: 1.0 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org No need to check a retval after we assigned a constant to it. Signed-off-by: Wolfram Sang Reviewed-by: Kieran Bingham --- 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], ®map_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], ®map_config); if (IS_ERR(dev->regmap[2])) { From patchwork Thu Jun 13 15:54:20 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfram Sang X-Patchwork-Id: 56896 X-Patchwork-Delegate: hverkuil@xs4all.nl Received: from vger.kernel.org ([209.132.180.67]) by www.linuxtv.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hbS3i-0002MD-4b; Thu, 13 Jun 2019 15:54:38 +0000 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389962AbfFMPyc (ORCPT + 1 other); Thu, 13 Jun 2019 11:54:32 -0400 Received: from sauhun.de ([88.99.104.3]:41948 "EHLO pokefinder.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390102AbfFMPy1 (ORCPT ); Thu, 13 Jun 2019 11:54:27 -0400 Received: from localhost (p5486CF99.dip0.t-ipconnect.de [84.134.207.153]) by pokefinder.org (Postfix) with ESMTPSA id F3DF44A12B1; Thu, 13 Jun 2019 17:54:25 +0200 (CEST) From: Wolfram Sang To: linux-media@vger.kernel.org Cc: linux-renesas-soc@vger.kernel.org, Wolfram Sang , Antti Palosaari , Mauro Carvalho Chehab , linux-kernel@vger.kernel.org Subject: [PATCH 4/4] media: zd1301_demod: don't check retval after our own assignemt Date: Thu, 13 Jun 2019 17:54:20 +0200 Message-Id: <20190613155421.16408-5-wsa+renesas@sang-engineering.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190613155421.16408-1-wsa+renesas@sang-engineering.com> References: <20190613155421.16408-1-wsa+renesas@sang-engineering.com> MIME-Version: 1.0 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org No need to check a retval after we assigned a constant to it. Signed-off-by: Wolfram Sang Reviewed-by: Kieran Bingham --- 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;