Commit c5533306 authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Lee Jones
Browse files

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: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Reported-by: default avatarkernel test robot <lkp@intel.com>
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
Link: https://lore.kernel.org/r/20220619082655.53728-1-u.kleine-koenig@pengutronix.de
parent 99a7ec2f

arch/arm/mach-pxa/eseries.c

+1 −2
Original line number Diff line number Diff line
@@ -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)

arch/arm/mach-pxa/tosa.c

+1 −3
Original line number Diff line number Diff line
@@ -678,13 +678,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)

drivers/mfd/tc6393xb.c

+2 −3
Original line number Diff line number Diff line
@@ -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

include/linux/mfd/tc6393xb.h

+1 −1
Original line number Diff line number Diff line
@@ -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);