A remove callback is only ever called for a bound device. So there is no
need to check for device or driver being NULL.

Signed-off-by: Uwe Kleine-König <u...@kleine-koenig.org>
---
 drivers/hid/intel-ish-hid/ishtp/bus.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/drivers/hid/intel-ish-hid/ishtp/bus.c 
b/drivers/hid/intel-ish-hid/ishtp/bus.c
index bba29cd36d29..ccd54f244503 100644
--- a/drivers/hid/intel-ish-hid/ishtp/bus.c
+++ b/drivers/hid/intel-ish-hid/ishtp/bus.c
@@ -257,17 +257,13 @@ static int ishtp_cl_bus_match(struct device *dev, struct 
device_driver *drv)
 static int ishtp_cl_device_remove(struct device *dev)
 {
        struct ishtp_cl_device *device = to_ishtp_cl_device(dev);
-       struct ishtp_cl_driver *driver;
-
-       if (!device || !dev->driver)
-               return 0;
+       struct ishtp_cl_driver *driver = to_ishtp_cl_driver(dev->driver);
 
        if (device->event_cb) {
                device->event_cb = NULL;
                cancel_work_sync(&device->event_work);
        }
 
-       driver = to_ishtp_cl_driver(dev->driver);
        if (!driver->remove) {
                dev->driver = NULL;
 

base-commit: 5c8fe583cce542aa0b84adc939ce85293de36e5e
-- 
2.29.2

Reply via email to