From: "Uwe Kleine-König" <uwe@kleine-koenig.org>
To: Hans Verkuil <hverkuil@xs4all.nl>,
Mauro Carvalho Chehab <mchehab@kernel.org>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH v2 2/3] media/radio: Make radio_isa_common_remove() return void
Date: Fri, 22 Jan 2021 10:24:48 +0100 [thread overview]
Message-ID: <20210122092449.426097-3-uwe@kleine-koenig.org> (raw)
In-Reply-To: <20210122092449.426097-1-uwe@kleine-koenig.org>
Instead of an unconditional return 0, return no value. One of the two
callers ignored the return value already before.
This simplifies the next patch.
Signed-off-by: Uwe Kleine-König <uwe@kleine-koenig.org>
---
drivers/media/radio/radio-isa.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/drivers/media/radio/radio-isa.c b/drivers/media/radio/radio-isa.c
index ad2ac16ff12d..527f4c3b0ca4 100644
--- a/drivers/media/radio/radio-isa.c
+++ b/drivers/media/radio/radio-isa.c
@@ -273,8 +273,8 @@ static int radio_isa_common_probe(struct radio_isa_card *isa,
return res;
}
-static int radio_isa_common_remove(struct radio_isa_card *isa,
- unsigned region_size)
+static void radio_isa_common_remove(struct radio_isa_card *isa,
+ unsigned region_size)
{
const struct radio_isa_ops *ops = isa->drv->ops;
@@ -285,7 +285,6 @@ static int radio_isa_common_remove(struct radio_isa_card *isa,
release_region(isa->io, region_size);
v4l2_info(&isa->v4l2_dev, "Removed radio card %s\n", isa->drv->card);
kfree(isa);
- return 0;
}
int radio_isa_probe(struct device *pdev, unsigned int dev)
@@ -342,7 +341,9 @@ int radio_isa_remove(struct device *pdev, unsigned int dev)
{
struct radio_isa_card *isa = dev_get_drvdata(pdev);
- return radio_isa_common_remove(isa, isa->drv->region_size);
+ radio_isa_common_remove(isa, isa->drv->region_size);
+
+ return 0;
}
EXPORT_SYMBOL_GPL(radio_isa_remove);
--
2.29.2
next prev parent reply other threads:[~2021-01-22 12:33 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-22 9:24 [PATCH v2 0/3] isa: Make the remove callback for isa drivers return void Uwe Kleine-König
2021-01-22 9:24 ` [PATCH v2 1/3] watchdog: pcwd: drop always-false if from remove callback Uwe Kleine-König
2021-01-22 9:24 ` Uwe Kleine-König [this message]
2021-01-25 9:51 ` [PATCH v2 2/3] media/radio: Make radio_isa_common_remove() return void Hans Verkuil
2021-01-22 9:24 ` [PATCH v2 3/3] isa: Make the remove callback for isa drivers " Uwe Kleine-König
2021-01-25 9:52 ` Hans Verkuil
2021-01-26 6:55 ` [PATCH v2 0/3] " Takashi Iwai
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=20210122092449.426097-3-uwe@kleine-koenig.org \
--to=uwe@kleine-koenig.org \
--cc=gregkh@linuxfoundation.org \
--cc=hverkuil@xs4all.nl \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=mchehab@kernel.org \
/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).