niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

mfd: tc6393xb: Make disable callback return void

Browse source 
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
This commit is contained in:
Uwe Kleine-König 2022-06-19 10:26:55 +02:00 • committed by Lee Jones
parent 99a7ec2f36
commit c55333064d
4 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
arch/arm/mach-pxa/eseries.c
View file

@ -86,11 +86,10 @@ int eseries_tmio_enable(struct platform_device *dev)
return 0; 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_SUSPEND, 0);
gpio_set_value(GPIO_ESERIES_TMIO_PCLR, 0); gpio_set_value(GPIO_ESERIES_TMIO_PCLR, 0);
return 0;
} }
int eseries_tmio_suspend(struct platform_device *dev) int eseries_tmio_suspend(struct platform_device *dev)

4
arch/arm/mach-pxa/tosa.c
View file

@ -678,13 +678,11 @@ err_req_pclr:
return rc; 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_L3V_ON);
gpio_free(TOSA_GPIO_TC6393XB_SUSPEND); gpio_free(TOSA_GPIO_TC6393XB_SUSPEND);
gpio_free(TOSA_GPIO_TC6393XB_REST_IN); gpio_free(TOSA_GPIO_TC6393XB_REST_IN);
return 0;
} }
static int tosa_tc6393xb_resume(struct platform_device *dev) static int tosa_tc6393xb_resume(struct platform_device *dev)

5
drivers/mfd/tc6393xb.c
View file

@ -798,20 +798,19 @@ static int tc6393xb_remove(struct platform_device *dev)
{ {
struct tc6393xb_platform_data *tcpd = dev_get_platdata(&dev->dev); struct tc6393xb_platform_data *tcpd = dev_get_platdata(&dev->dev);
struct tc6393xb *tc6393xb = platform_get_drvdata(dev); struct tc6393xb *tc6393xb = platform_get_drvdata(dev);
int ret;
mfd_remove_devices(&dev->dev); mfd_remove_devices(&dev->dev);
tc6393xb_detach_irq(dev); tc6393xb_detach_irq(dev);
ret = tcpd->disable(dev); tcpd->disable(dev);
clk_disable_unprepare(tc6393xb->clk); clk_disable_unprepare(tc6393xb->clk);
iounmap(tc6393xb->scr); iounmap(tc6393xb->scr);
release_resource(&tc6393xb->rscr); release_resource(&tc6393xb->rscr);
clk_put(tc6393xb->clk); clk_put(tc6393xb->clk);
kfree(tc6393xb); kfree(tc6393xb);
return ret; return 0;
} }
#ifdef CONFIG_PM #ifdef CONFIG_PM

2
include/linux/mfd/tc6393xb.h
View file

@ -22,7 +22,7 @@ struct tc6393xb_platform_data {
u16 scr_gper; /* GP Enable */ u16 scr_gper; /* GP Enable */
int (*enable)(struct platform_device *dev); 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 (*suspend)(struct platform_device *dev);
int (*resume)(struct platform_device *dev); int (*resume)(struct platform_device *dev);