HID: intel-ish-hid: Simplify logic in ishtp_cl_device_remove()

There is only a single change in behavior: Now dev->driver isn't modified.
Assigning to this variable is in the domain of the driver core only. (And
it's done in __device_release_driver shortly after bus->remove() (i.e
ishtp_cl_device_remove() here) returns.)

Signed-off-by: Uwe Kleine-König <uwe@kleine-koenig.org>
Acked-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>

diff --git a/drivers/hid/intel-ish-hid/ishtp/bus.c b/drivers/hid/intel-ish-hid/ishtp/bus.c
index ccd54f244503b6877f184961e52dac3dc98b43ca..7f36ce6187a1c4d21b5c8a287890e5f4e9da6dab 100644 (file)
--- a/drivers/hid/intel-ish-hid/ishtp/bus.c
+++ b/drivers/hid/intel-ish-hid/ishtp/bus.c
@@ -258,19 +258,17 @@ static int ishtp_cl_device_remove(struct device *dev)
 {
        struct ishtp_cl_device *device = to_ishtp_cl_device(dev);
        struct ishtp_cl_driver *driver = to_ishtp_cl_driver(dev->driver);
+       int ret = 0;
 
        if (device->event_cb) {
                device->event_cb = NULL;
                cancel_work_sync(&device->event_work);
        }
 
-       if (!driver->remove) {
-               dev->driver = NULL;
+       if (driver->remove)
+               ret = driver->remove(device);
 
-               return 0;
-       }
-
-       return driver->remove(device);
+       return ret;
 }
 
 /**