diff mbox series

[v2,2/3] media/radio: Make radio_isa_common_remove() return void

Message ID 20210122092449.426097-3-uwe@kleine-koenig.org (mailing list archive)
State Not Applicable, archived
Headers
Series None |

Commit Message

Uwe Kleine-König Jan. 22, 2021, 9:24 a.m. UTC 
  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(-)

Comments

Hans Verkuil Jan. 25, 2021, 9:51 a.m. UTC | #1 
On 22/01/2021 10:24, Uwe Kleine-König wrote:
> 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>

Thanks!

	Hans

> ---
>  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);
>  
>
diff mbox series

Patch

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);