Skip to content

Commit dd92670

Browse files
Uwe Kleine-Königalexandrebelloni
authored andcommitted
i3c: Make remove callback return void
The driver core ignores the return value of struct bus_type::remove() because there is only little that can be done. To simplify the quest to make this function return void, let struct i3c_driver::remove() return void, too. This makes it obvious that returning an error code is a bad idea and future driver authors cannot get that wrong. Up to now there are no drivers with a remove callback, so there is no need to adapt drivers. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Link: https://lore.kernel.org/r/20210128091048.17006-2-u.kleine-koenig@pengutronix.de
1 parent 7456fea commit dd92670

2 files changed

Lines changed: 4 additions & 8 deletions

File tree

drivers/i3c/master.c

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -326,17 +326,13 @@ static int i3c_device_remove(struct device *dev)
326326
{
327327
struct i3c_device *i3cdev = dev_to_i3cdev(dev);
328328
struct i3c_driver *driver = drv_to_i3cdrv(dev->driver);
329-
int ret = 0;
330329

331-
if (driver->remove) {
332-
ret = driver->remove(i3cdev);
333-
if (ret)
334-
return ret;
335-
}
330+
if (driver->remove)
331+
driver->remove(i3cdev);
336332

337333
i3c_device_free_ibi(i3cdev);
338334

339-
return ret;
335+
return 0;
340336
}
341337

342338
struct bus_type i3c_bus_type = {

include/linux/i3c/device.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ struct i3c_device;
176176
struct i3c_driver {
177177
struct device_driver driver;
178178
int (*probe)(struct i3c_device *dev);
179-
int (*remove)(struct i3c_device *dev);
179+
void (*remove)(struct i3c_device *dev);
180180
const struct i3c_device_id *id_table;
181181
};
182182

0 commit comments

Comments
 (0)