summaryrefslogtreecommitdiff
path: root/drivers/media/radio
diff options
context:
space:
mode:
authorUwe Kleine-König <uwe@kleine-koenig.org>2021-01-22 12:24:48 +0300
committerTakashi Iwai <tiwai@suse.de>2021-01-26 09:41:11 +0300
commit7797b4e00faf3229ef67ac37015dd2ee8e4c7901 (patch)
treec0dcbb16ca6111abdbcb17e78b96f81318ed4524 /drivers/media/radio
parentd2006bb79411c56b7bb6173f753a0ba6172d1fe6 (diff)
downloadlinux-7797b4e00faf3229ef67ac37015dd2ee8e4c7901.tar.xz
media/radio: Make radio_isa_common_remove() return void
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> Reviewed-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> Link: https://lore.kernel.org/r/20210122092449.426097-3-uwe@kleine-koenig.org Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'drivers/media/radio')
-rw-r--r--drivers/media/radio/radio-isa.c9
1 files 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 @@ err_dev_reg:
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);