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 <u.kleine-koenig@pengutronix.de>
Reported-by: kernel test robot <lkp@intel.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Link: https://lore.kernel.org/r/20220619082655.53728-1-u.kleine-koenig@pengutronix.de

diff --git a/arch/arm/mach-pxa/eseries.c b/arch/arm/mach-pxa/eseries.c
index 99781ee..6226aee 100644 (file)
--- a/arch/arm/mach-pxa/eseries.c
+++ b/arch/arm/mach-pxa/eseries.c
@@ -86,11 +86,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 6af8bc4..d41641d 100644 (file)
--- a/arch/arm/mach-pxa/tosa.c
+++ b/arch/arm/mach-pxa/tosa.c
@@ -678,13 +678,11 @@ err_req_pclr:
        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 0be5731..aa903a3 100644 (file)
--- a/drivers/mfd/tc6393xb.c
+++ b/drivers/mfd/tc6393xb.c
@@ -798,20 +798,19 @@ 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);
 
        tc6393xb_detach_irq(dev);
 
-       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 d336c54..d17807f 100644 (file)
--- 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);