linux-media.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Alexandra Diupina <adiupina@astralinux.ru>
To: Hans de Goede <hdegoede@redhat.com>
Cc: "Alexandra Diupina" <adiupina@astralinux.ru>,
	"Mauro Carvalho Chehab" <mchehab@kernel.org>,
	"Sakari Ailus" <sakari.ailus@linux.intel.com>,
	"Greg Kroah-Hartman" <gregkh@linuxfoundation.org>,
	"Andy Shevchenko" <andy@kernel.org>,
	"Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>,
	linux-media@vger.kernel.org, linux-staging@lists.linux.dev,
	linux-kernel@vger.kernel.org, lvc-project@linuxtesting.org
Subject: [PATCH 1/4] Remove redundant return value check
Date: Thu,  2 Nov 2023 17:11:32 +0300	[thread overview]
Message-ID: <20231102141135.369-1-adiupina@astralinux.ru> (raw)

media_entity_pads_init() will not return 0 only if the
2nd parameter >= MEDIA_ENTITY_MAX_PADS (512), but 1 is
passed, so checking the return value is redundant

Found by Linux Verification Center (linuxtesting.org) with SVACE.

Fixes: ad85094b293e ("Revert "media: staging: atomisp: Remove driver"")
Signed-off-by: Alexandra Diupina <adiupina@astralinux.ru>
---
 drivers/staging/media/atomisp/i2c/atomisp-gc2235.c        | 4 +---
 drivers/staging/media/atomisp/i2c/atomisp-mt9m114.c       | 6 +-----
 drivers/staging/media/atomisp/i2c/atomisp-ov2722.c        | 2 --
 drivers/staging/media/atomisp/i2c/ov5693/atomisp-ov5693.c | 2 --
 4 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/drivers/staging/media/atomisp/i2c/atomisp-gc2235.c b/drivers/staging/media/atomisp/i2c/atomisp-gc2235.c
index 9fa390fbc5f3..f10931a03285 100644
--- a/drivers/staging/media/atomisp/i2c/atomisp-gc2235.c
+++ b/drivers/staging/media/atomisp/i2c/atomisp-gc2235.c
@@ -840,9 +840,7 @@ static int gc2235_probe(struct i2c_client *client)
 	dev->ctrl_handler.lock = &dev->input_lock;
 	dev->sd.ctrl_handler = &dev->ctrl_handler;
 
-	ret = media_entity_pads_init(&dev->sd.entity, 1, &dev->pad);
-	if (ret)
-		gc2235_remove(client);
+	media_entity_pads_init(&dev->sd.entity, 1, &dev->pad);
 
 	return atomisp_register_i2c_module(&dev->sd, gcpdev, RAW_CAMERA);
 
diff --git a/drivers/staging/media/atomisp/i2c/atomisp-mt9m114.c b/drivers/staging/media/atomisp/i2c/atomisp-mt9m114.c
index 1c6643c442ef..b7a940fdbd0a 100644
--- a/drivers/staging/media/atomisp/i2c/atomisp-mt9m114.c
+++ b/drivers/staging/media/atomisp/i2c/atomisp-mt9m114.c
@@ -1581,11 +1581,7 @@ static int mt9m114_probe(struct i2c_client *client)
 
 	/* REVISIT: Do we need media controller? */
 	ret = media_entity_pads_init(&dev->sd.entity, 1, &dev->pad);
-	if (ret) {
-		mt9m114_remove(client);
-		return ret;
-	}
-	return 0;
+	return ret;
 }
 
 static const struct acpi_device_id mt9m114_acpi_match[] = {
diff --git a/drivers/staging/media/atomisp/i2c/atomisp-ov2722.c b/drivers/staging/media/atomisp/i2c/atomisp-ov2722.c
index 6a72691ed5b7..922774293bf4 100644
--- a/drivers/staging/media/atomisp/i2c/atomisp-ov2722.c
+++ b/drivers/staging/media/atomisp/i2c/atomisp-ov2722.c
@@ -993,8 +993,6 @@ static int ov2722_probe(struct i2c_client *client)
 	dev->sd.entity.function = MEDIA_ENT_F_CAM_SENSOR;
 
 	ret = media_entity_pads_init(&dev->sd.entity, 1, &dev->pad);
-	if (ret)
-		ov2722_remove(client);
 
 	return atomisp_register_i2c_module(&dev->sd, ovpdev, RAW_CAMERA);
 
diff --git a/drivers/staging/media/atomisp/i2c/ov5693/atomisp-ov5693.c b/drivers/staging/media/atomisp/i2c/ov5693/atomisp-ov5693.c
index 460a4e34c55b..8d5b74fb5d9c 100644
--- a/drivers/staging/media/atomisp/i2c/ov5693/atomisp-ov5693.c
+++ b/drivers/staging/media/atomisp/i2c/ov5693/atomisp-ov5693.c
@@ -1733,8 +1733,6 @@ static int ov5693_probe(struct i2c_client *client)
 	dev->sd.ctrl_handler = &dev->ctrl_handler;
 
 	ret = media_entity_pads_init(&dev->sd.entity, 1, &dev->pad);
-	if (ret)
-		ov5693_remove(client);
 
 	return ret;
 out_free:
-- 
2.30.2


             reply	other threads:[~2023-11-02 14:11 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-11-02 14:11 Alexandra Diupina [this message]
2023-11-02 14:11 ` [PATCH 2/4] Remove redundant return value check Alexandra Diupina
2023-11-02 14:55   ` Jacopo Mondi
2023-11-02 15:38   ` Laurent Pinchart
2023-11-02 14:11 ` [PATCH 3/4] " Alexandra Diupina
2023-11-02 14:11 ` [PATCH 4/4] " Alexandra Diupina
2023-11-02 14:21 ` [PATCH 1/4] " Hans de Goede
2023-11-02 15:09   ` Sakari Ailus
2023-11-02 14:31 ` Dan Carpenter
2023-11-02 14:35 ` Dan Carpenter
2023-11-02 14:37   ` Hans de Goede
2023-11-02 15:46 ` Uwe Kleine-König

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20231102141135.369-1-adiupina@astralinux.ru \
    --to=adiupina@astralinux.ru \
    --cc=andy@kernel.org \
    --cc=gregkh@linuxfoundation.org \
    --cc=hdegoede@redhat.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-media@vger.kernel.org \
    --cc=linux-staging@lists.linux.dev \
    --cc=lvc-project@linuxtesting.org \
    --cc=mchehab@kernel.org \
    --cc=sakari.ailus@linux.intel.com \
    --cc=u.kleine-koenig@pengutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).