mei: bus: simplify mei_cl_device_remove()
The driver core only calls a bus' remove function when there is actually a driver and a device. So drop the needless check and assign cldrv earlier. (Side note: The check for cldev being non-NULL is broken anyhow, because to_mei_cl_device() is a wrapper around container_of() for a member that is not the first one. So cldev only can become NULL if dev is (void *)0xc (for archs with 32 bit pointers) or (void *)0x18 (for archs with 64 bit pointers).) Signed-off-by: Uwe Kleine-König <uwe@kleine-koenig.org> Link: https://lore.kernel.org/r/20210208073705.428185-2-uwe@kleine-koenig.org Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Родитель
369aea8459
Коммит
f320ff0387
|
@ -880,13 +880,9 @@ static int mei_cl_device_probe(struct device *dev)
|
|||
static int mei_cl_device_remove(struct device *dev)
|
||||
{
|
||||
struct mei_cl_device *cldev = to_mei_cl_device(dev);
|
||||
struct mei_cl_driver *cldrv;
|
||||
struct mei_cl_driver *cldrv = to_mei_cl_driver(dev->driver);
|
||||
int ret = 0;
|
||||
|
||||
if (!cldev || !dev->driver)
|
||||
return 0;
|
||||
|
||||
cldrv = to_mei_cl_driver(dev->driver);
|
||||
if (cldrv->remove)
|
||||
ret = cldrv->remove(cldev);
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче