sa11x0_drv_pcmcia_legacy_remove() returns zero unconditionally. Letting it
return void instead makes it easier to see in the caller that there is no
error to handle.
This is a preparation for making platform remove callbacks return void.
Signed-off-by: Uwe Kleine-König <[email protected]>
---
drivers/pcmcia/sa1100_generic.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/pcmcia/sa1100_generic.c b/drivers/pcmcia/sa1100_generic.c
index 47b060c57418..c2b6e828c2c6 100644
--- a/drivers/pcmcia/sa1100_generic.c
+++ b/drivers/pcmcia/sa1100_generic.c
@@ -125,7 +125,7 @@ static int sa11x0_drv_pcmcia_legacy_probe(struct platform_device *dev)
return ret;
}
-static int sa11x0_drv_pcmcia_legacy_remove(struct platform_device *dev)
+static void sa11x0_drv_pcmcia_legacy_remove(struct platform_device *dev)
{
struct skt_dev_info *sinfo = platform_get_drvdata(dev);
int i;
@@ -134,8 +134,6 @@ static int sa11x0_drv_pcmcia_legacy_remove(struct platform_device *dev)
for (i = 0; i < sinfo->nskt; i++)
soc_pcmcia_remove_one(&sinfo->skt[i]);
-
- return 0;
}
static int sa11x0_drv_pcmcia_probe(struct platform_device *pdev)
@@ -167,8 +165,10 @@ static int sa11x0_drv_pcmcia_remove(struct platform_device *dev)
{
struct soc_pcmcia_socket *skt;
- if (dev->id == -1)
- return sa11x0_drv_pcmcia_legacy_remove(dev);
+ if (dev->id == -1) {
+ sa11x0_drv_pcmcia_legacy_remove(dev);
+ return 0;
+ }
skt = platform_get_drvdata(dev);
base-commit: f2906aa863381afb0015a9eb7fefad885d4e5a56
--
2.36.1
Hello Dominik,
On Thu, Jul 14, 2022 at 11:45:34PM +0200, Uwe Kleine-K?nig wrote:
> sa11x0_drv_pcmcia_legacy_remove() returns zero unconditionally. Letting it
> return void instead makes it easier to see in the caller that there is no
> error to handle.
>
> This is a preparation for making platform remove callbacks return void.
>
> Signed-off-by: Uwe Kleine-K?nig <[email protected]>
This patch still applies on top of v6.0-rc1. I didn't get any feedback
about it yet. Is there someone else I should send this patch to?
Best regards
Uwe
> ---
> drivers/pcmcia/sa1100_generic.c | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/pcmcia/sa1100_generic.c b/drivers/pcmcia/sa1100_generic.c
> index 47b060c57418..c2b6e828c2c6 100644
> --- a/drivers/pcmcia/sa1100_generic.c
> +++ b/drivers/pcmcia/sa1100_generic.c
> @@ -125,7 +125,7 @@ static int sa11x0_drv_pcmcia_legacy_probe(struct platform_device *dev)
> return ret;
> }
>
> -static int sa11x0_drv_pcmcia_legacy_remove(struct platform_device *dev)
> +static void sa11x0_drv_pcmcia_legacy_remove(struct platform_device *dev)
> {
> struct skt_dev_info *sinfo = platform_get_drvdata(dev);
> int i;
> @@ -134,8 +134,6 @@ static int sa11x0_drv_pcmcia_legacy_remove(struct platform_device *dev)
>
> for (i = 0; i < sinfo->nskt; i++)
> soc_pcmcia_remove_one(&sinfo->skt[i]);
> -
> - return 0;
> }
>
> static int sa11x0_drv_pcmcia_probe(struct platform_device *pdev)
> @@ -167,8 +165,10 @@ static int sa11x0_drv_pcmcia_remove(struct platform_device *dev)
> {
> struct soc_pcmcia_socket *skt;
>
> - if (dev->id == -1)
> - return sa11x0_drv_pcmcia_legacy_remove(dev);
> + if (dev->id == -1) {
> + sa11x0_drv_pcmcia_legacy_remove(dev);
> + return 0;
> + }
>
> skt = platform_get_drvdata(dev);
>
>
> base-commit: f2906aa863381afb0015a9eb7fefad885d4e5a56
--
Pengutronix e.K. | Uwe Kleine-K?nig |
Industrial Linux Solutions | https://www.pengutronix.de/ |
Am Thu, Jul 14, 2022 at 11:45:34PM +0200 schrieb Uwe Kleine-K?nig:
> sa11x0_drv_pcmcia_legacy_remove() returns zero unconditionally. Letting it
> return void instead makes it easier to see in the caller that there is no
> error to handle.
>
> This is a preparation for making platform remove callbacks return void.
>
> Signed-off-by: Uwe Kleine-K?nig <[email protected]>
Applied to the pcmcia tree.
Thanks,
Dominik