2022-06-01 09:37:28

by Uwe Kleine-König

[permalink] [raw]
Subject: [PATCH 4/4] mfd: tc6393xb: Make disable callback return void

All implementations return 0, so simplify accordingly.

This is a preparation for making platform remove callbacks return void.

Signed-off-by: Uwe Kleine-König <[email protected]>
---
arch/arm/mach-pxa/eseries.c | 3 +--
arch/arm/mach-pxa/tosa.c | 4 +---
drivers/mfd/tc6393xb.c | 5 ++---
include/linux/mfd/tc6393xb.h | 2 +-
4 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/arch/arm/mach-pxa/eseries.c b/arch/arm/mach-pxa/eseries.c
index cb7bf6294e12..c0b496300e3f 100644
--- a/arch/arm/mach-pxa/eseries.c
+++ b/arch/arm/mach-pxa/eseries.c
@@ -85,11 +85,10 @@ int eseries_tmio_enable(struct platform_device *dev)
return 0;
}

-int eseries_tmio_disable(struct platform_device *dev)
+void eseries_tmio_disable(struct platform_device *dev)
{
gpio_set_value(GPIO_ESERIES_TMIO_SUSPEND, 0);
gpio_set_value(GPIO_ESERIES_TMIO_PCLR, 0);
- return 0;
}

int eseries_tmio_suspend(struct platform_device *dev)
diff --git a/arch/arm/mach-pxa/tosa.c b/arch/arm/mach-pxa/tosa.c
index 431709725d02..8d97c0d74e8f 100644
--- a/arch/arm/mach-pxa/tosa.c
+++ b/arch/arm/mach-pxa/tosa.c
@@ -662,13 +662,11 @@ static int tosa_tc6393xb_enable(struct platform_device *dev)
return rc;
}

-static int tosa_tc6393xb_disable(struct platform_device *dev)
+static void tosa_tc6393xb_disable(struct platform_device *dev)
{
gpio_free(TOSA_GPIO_TC6393XB_L3V_ON);
gpio_free(TOSA_GPIO_TC6393XB_SUSPEND);
gpio_free(TOSA_GPIO_TC6393XB_REST_IN);
-
- return 0;
}

static int tosa_tc6393xb_resume(struct platform_device *dev)
diff --git a/drivers/mfd/tc6393xb.c b/drivers/mfd/tc6393xb.c
index 3d5b14c60e20..7de210f143de 100644
--- a/drivers/mfd/tc6393xb.c
+++ b/drivers/mfd/tc6393xb.c
@@ -734,7 +734,6 @@ static int tc6393xb_remove(struct platform_device *dev)
{
struct tc6393xb_platform_data *tcpd = dev_get_platdata(&dev->dev);
struct tc6393xb *tc6393xb = platform_get_drvdata(dev);
- int ret;

mfd_remove_devices(&dev->dev);

@@ -746,14 +745,14 @@ static int tc6393xb_remove(struct platform_device *dev)
if (tc6393xb->gpio.base != -1)
gpiochip_remove(&tc6393xb->gpio);

- ret = tcpd->disable(dev);
+ tcpd->disable(dev);
clk_disable_unprepare(tc6393xb->clk);
iounmap(tc6393xb->scr);
release_resource(&tc6393xb->rscr);
clk_put(tc6393xb->clk);
kfree(tc6393xb);

- return ret;
+ return 0;
}

#ifdef CONFIG_PM
diff --git a/include/linux/mfd/tc6393xb.h b/include/linux/mfd/tc6393xb.h
index fcc8e74f0e8d..602b391ed13a 100644
--- a/include/linux/mfd/tc6393xb.h
+++ b/include/linux/mfd/tc6393xb.h
@@ -22,7 +22,7 @@ struct tc6393xb_platform_data {
u16 scr_gper; /* GP Enable */

int (*enable)(struct platform_device *dev);
- int (*disable)(struct platform_device *dev);
+ void (*disable)(struct platform_device *dev);
int (*suspend)(struct platform_device *dev);
int (*resume)(struct platform_device *dev);

--
2.36.1



2022-06-15 21:36:35

by Lee Jones

[permalink] [raw]
Subject: Re: [PATCH 4/4] mfd: tc6393xb: Make disable callback return void

On Mon, 30 May 2022, Uwe Kleine-König wrote:

> All implementations return 0, so simplify accordingly.
>
> This is a preparation for making platform remove callbacks return void.
>
> Signed-off-by: Uwe Kleine-König <[email protected]>
> ---
> arch/arm/mach-pxa/eseries.c | 3 +--
> arch/arm/mach-pxa/tosa.c | 4 +---

Needs an Arm Ack.

> drivers/mfd/tc6393xb.c | 5 ++---
> include/linux/mfd/tc6393xb.h | 2 +-
> 4 files changed, 5 insertions(+), 9 deletions(-)

Doesn't apply. Please rebase and resubmit.

--
Lee Jones [李琼斯]
Principal Technical Lead - Developer Services
Linaro.org │ Open source software for Arm SoCs
Follow Linaro: Facebook | Twitter | Blog