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

mfd: stmpe: Make stmpe_remove() return void 



Up to now stmpe_remove() returns zero unconditionally. Make it return
void instead which makes it easier to see in the callers that there is
no error to handle.

Also the return value of i2c and spi remove callbacks is ignored anyway.

Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
Link: https://lore.kernel.org/r/20211012153945.2651412-10-u.kleine-koenig@pengutronix.de
parent c39cf60f

drivers/mfd/stmpe-i2c.c

+3 −1
Original line number Original line Diff line number Diff line
@@ -95,7 +95,9 @@ static int stmpe_i2c_remove(struct i2c_client *i2c) 
{

{

	struct stmpe *stmpe = dev_get_drvdata(&i2c->dev);

	struct stmpe *stmpe = dev_get_drvdata(&i2c->dev);





	return stmpe_remove(stmpe);

	stmpe_remove(stmpe);



	return 0;

}

}





static const struct i2c_device_id stmpe_i2c_id[] = {

static const struct i2c_device_id stmpe_i2c_id[] = {

drivers/mfd/stmpe-spi.c

+3 −1
Original line number Original line Diff line number Diff line
@@ -106,7 +106,9 @@ static int stmpe_spi_remove(struct spi_device *spi) 
{

{

	struct stmpe *stmpe = spi_get_drvdata(spi);

	struct stmpe *stmpe = spi_get_drvdata(spi);





	return stmpe_remove(stmpe);

	stmpe_remove(stmpe);



	return 0;

}

}





static const struct of_device_id stmpe_spi_of_match[] = {

static const struct of_device_id stmpe_spi_of_match[] = {

drivers/mfd/stmpe.c

+1 −3
Original line number Original line Diff line number Diff line
@@ -1496,7 +1496,7 @@ int stmpe_probe(struct stmpe_client_info *ci, enum stmpe_partnum partnum) 
	return ret;

	return ret;

}

}





int stmpe_remove(struct stmpe *stmpe)

void stmpe_remove(struct stmpe *stmpe)

{

{

	if (!IS_ERR(stmpe->vio))

	if (!IS_ERR(stmpe->vio))

		regulator_disable(stmpe->vio);

		regulator_disable(stmpe->vio);
@@ -1506,8 +1506,6 @@ int stmpe_remove(struct stmpe *stmpe) 
	__stmpe_disable(stmpe, STMPE_BLOCK_ADC);

	__stmpe_disable(stmpe, STMPE_BLOCK_ADC);





	mfd_remove_devices(stmpe->dev);

	mfd_remove_devices(stmpe->dev);



	return 0;

}

}





#ifdef CONFIG_PM

#ifdef CONFIG_PM

drivers/mfd/stmpe.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -98,7 +98,7 @@ struct stmpe_client_info { 
};

};





int stmpe_probe(struct stmpe_client_info *ci, enum stmpe_partnum partnum);

int stmpe_probe(struct stmpe_client_info *ci, enum stmpe_partnum partnum);

int stmpe_remove(struct stmpe *stmpe);

void stmpe_remove(struct stmpe *stmpe);





#define STMPE_ICR_LSB_HIGH	(1 << 2)

#define STMPE_ICR_LSB_HIGH	(1 << 2)

#define STMPE_ICR_LSB_EDGE	(1 << 1)

#define STMPE_ICR_LSB_EDGE	(1 << 1)