Commit 85385a51 authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Greg Kroah-Hartman
Browse files

misc: ad525x_dpot: Make ad_dpot_remove() return void 



Up to now ad_dpot_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>
Link: https://lore.kernel.org/r/20211012153945.2651412-12-u.kleine-koenig@pengutronix.de


Acked-by: default avatarMichael Hennerich <michael.hennerich@analog.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 4df4946d

drivers/misc/ad525x_dpot-i2c.c

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


static int ad_dpot_i2c_remove(struct i2c_client *client)

{

	return ad_dpot_remove(&client->dev);

	ad_dpot_remove(&client->dev);

	return 0;

}



static const struct i2c_device_id ad_dpot_id[] = {

drivers/misc/ad525x_dpot-spi.c

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


static int ad_dpot_spi_remove(struct spi_device *spi)

{

	return ad_dpot_remove(&spi->dev);

	ad_dpot_remove(&spi->dev);

	return 0;

}



static const struct spi_device_id ad_dpot_spi_id[] = {

drivers/misc/ad525x_dpot.c

+1 −3
Original line number Diff line number Diff line
@@ -743,7 +743,7 @@ int ad_dpot_probe(struct device *dev, 
}

EXPORT_SYMBOL(ad_dpot_probe);



int ad_dpot_remove(struct device *dev)

void ad_dpot_remove(struct device *dev)

{

	struct dpot_data *data = dev_get_drvdata(dev);

	int i;
@@ -753,8 +753,6 @@ int ad_dpot_remove(struct device *dev) 
			ad_dpot_remove_files(dev, data->feat, i);



	kfree(data);



	return 0;

}

EXPORT_SYMBOL(ad_dpot_remove);

drivers/misc/ad525x_dpot.h

+1 −1
Original line number Diff line number Diff line
@@ -209,6 +209,6 @@ struct ad_dpot_bus_data { 


int ad_dpot_probe(struct device *dev, struct ad_dpot_bus_data *bdata,

		  unsigned long devid, const char *name);

int ad_dpot_remove(struct device *dev);

void ad_dpot_remove(struct device *dev);



#endif