Message ID | 20220618204037.35947-1-u.kleine-koenig@pengutronix.de (mailing list archive) |
---|---|
State | Accepted |
Commit | 3bc5342c2e4aa07769ff4e5f6614ebb3a001fb55 |
Headers | show |
Series | mips: sgi-ip22: Drop redundant check from .remove() | expand |
On Sat, Jun 18, 2022 at 10:40:37PM +0200, Uwe Kleine-König wrote: > The remove callback is only called by the driver core if there is a > driver to unbind, so there is no need to check dev->driver to be > non-NULL. > > Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> > --- > arch/mips/sgi-ip22/ip22-gio.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/arch/mips/sgi-ip22/ip22-gio.c b/arch/mips/sgi-ip22/ip22-gio.c > index 38d12f417e48..8686e8c1c4e5 100644 > --- a/arch/mips/sgi-ip22/ip22-gio.c > +++ b/arch/mips/sgi-ip22/ip22-gio.c > @@ -148,7 +148,7 @@ static void gio_device_remove(struct device *dev) > struct gio_device *gio_dev = to_gio_device(dev); > struct gio_driver *drv = to_gio_driver(dev->driver); > > - if (dev->driver && drv->remove) > + if (drv->remove) > drv->remove(gio_dev); > } > > > base-commit: f2906aa863381afb0015a9eb7fefad885d4e5a56 > -- > 2.36.1 applied to mips-next. Thomas.
diff --git a/arch/mips/sgi-ip22/ip22-gio.c b/arch/mips/sgi-ip22/ip22-gio.c index 38d12f417e48..8686e8c1c4e5 100644 --- a/arch/mips/sgi-ip22/ip22-gio.c +++ b/arch/mips/sgi-ip22/ip22-gio.c @@ -148,7 +148,7 @@ static void gio_device_remove(struct device *dev) struct gio_device *gio_dev = to_gio_device(dev); struct gio_driver *drv = to_gio_driver(dev->driver); - if (dev->driver && drv->remove) + if (drv->remove) drv->remove(gio_dev); }
The remove callback is only called by the driver core if there is a driver to unbind, so there is no need to check dev->driver to be non-NULL. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> --- arch/mips/sgi-ip22/ip22-gio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) base-commit: f2906aa863381afb0015a9eb7fefad885d4e5a56