mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-11-15 00:04:15 +08:00
Input: adxl34x - make adxl34x_remove() return void
Up to now adxl34x_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: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Link: https://lore.kernel.org/r/20211012153945.2651412-6-u.kleine-koenig@pengutronix.de Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
This commit is contained in:
parent
b415ed4f49
commit
af98ff045f
@ -103,7 +103,9 @@ static int adxl34x_i2c_remove(struct i2c_client *client)
|
||||
{
|
||||
struct adxl34x *ac = i2c_get_clientdata(client);
|
||||
|
||||
return adxl34x_remove(ac);
|
||||
adxl34x_remove(ac);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int __maybe_unused adxl34x_i2c_suspend(struct device *dev)
|
||||
|
@ -91,7 +91,9 @@ static int adxl34x_spi_remove(struct spi_device *spi)
|
||||
{
|
||||
struct adxl34x *ac = spi_get_drvdata(spi);
|
||||
|
||||
return adxl34x_remove(ac);
|
||||
adxl34x_remove(ac);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int __maybe_unused adxl34x_spi_suspend(struct device *dev)
|
||||
|
@ -896,15 +896,13 @@ struct adxl34x *adxl34x_probe(struct device *dev, int irq,
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(adxl34x_probe);
|
||||
|
||||
int adxl34x_remove(struct adxl34x *ac)
|
||||
void adxl34x_remove(struct adxl34x *ac)
|
||||
{
|
||||
sysfs_remove_group(&ac->dev->kobj, &adxl34x_attr_group);
|
||||
free_irq(ac->irq, ac);
|
||||
input_unregister_device(ac->input);
|
||||
dev_dbg(ac->dev, "unregistered accelerometer\n");
|
||||
kfree(ac);
|
||||
|
||||
return 0;
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(adxl34x_remove);
|
||||
|
||||
|
@ -25,6 +25,6 @@ void adxl34x_resume(struct adxl34x *ac);
|
||||
struct adxl34x *adxl34x_probe(struct device *dev, int irq,
|
||||
bool fifo_delay_default,
|
||||
const struct adxl34x_bus_ops *bops);
|
||||
int adxl34x_remove(struct adxl34x *ac);
|
||||
void adxl34x_remove(struct adxl34x *ac);
|
||||
|
||||
#endif
|
||||
|
Loading…
Reference in New Issue
Block a user