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

mfd: mc13xxx: Make mc13xxx_common_exit() return void 



Up to now mc13xxx_common_exit() 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-9-u.kleine-koenig@pengutronix.de
parent 3bb4fb68

drivers/mfd/mc13xxx-core.c

+1 −3
Original line number Original line Diff line number Diff line
@@ -496,15 +496,13 @@ int mc13xxx_common_init(struct device *dev) 
}

}

EXPORT_SYMBOL_GPL(mc13xxx_common_init);

EXPORT_SYMBOL_GPL(mc13xxx_common_init);





int mc13xxx_common_exit(struct device *dev)

void mc13xxx_common_exit(struct device *dev)

{

{

	struct mc13xxx *mc13xxx = dev_get_drvdata(dev);

	struct mc13xxx *mc13xxx = dev_get_drvdata(dev);





	mfd_remove_devices(dev);

	mfd_remove_devices(dev);

	regmap_del_irq_chip(mc13xxx->irq, mc13xxx->irq_data);

	regmap_del_irq_chip(mc13xxx->irq, mc13xxx->irq_data);

	mutex_destroy(&mc13xxx->lock);

	mutex_destroy(&mc13xxx->lock);



	return 0;

}

}

EXPORT_SYMBOL_GPL(mc13xxx_common_exit);

EXPORT_SYMBOL_GPL(mc13xxx_common_exit);

drivers/mfd/mc13xxx-i2c.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -87,7 +87,8 @@ static int mc13xxx_i2c_probe(struct i2c_client *client, 




static int mc13xxx_i2c_remove(struct i2c_client *client)

static int mc13xxx_i2c_remove(struct i2c_client *client)

{

{

	return mc13xxx_common_exit(&client->dev);

	mc13xxx_common_exit(&client->dev);

	return 0;

}

}





static struct i2c_driver mc13xxx_i2c_driver = {

static struct i2c_driver mc13xxx_i2c_driver = {

drivers/mfd/mc13xxx-spi.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -168,7 +168,8 @@ static int mc13xxx_spi_probe(struct spi_device *spi) 




static int mc13xxx_spi_remove(struct spi_device *spi)

static int mc13xxx_spi_remove(struct spi_device *spi)

{

{

	return mc13xxx_common_exit(&spi->dev);

	mc13xxx_common_exit(&spi->dev);

	return 0;

}

}





static struct spi_driver mc13xxx_spi_driver = {

static struct spi_driver mc13xxx_spi_driver = {

drivers/mfd/mc13xxx.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -44,6 +44,6 @@ struct mc13xxx { 
};

};





int mc13xxx_common_init(struct device *dev);

int mc13xxx_common_init(struct device *dev);

int mc13xxx_common_exit(struct device *dev);

void mc13xxx_common_exit(struct device *dev);





#endif /* __DRIVERS_MFD_MC13XXX_H */
 
#endif /* __DRIVERS_MFD_MC13XXX_H */