summaryrefslogtreecommitdiff
path: root/drivers/hid
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2020-10-15 21:39:41 +0300
committerJiri Kosina <jkosina@suse.cz>2020-10-15 21:39:41 +0300
commitd61a5d631455544d080050916db05ef66eca187e (patch)
tree1709b07f3774435dcd19be28be35ec053a34147e /drivers/hid
parent1341c58615e914d500fe0354b7212f7b188397d7 (diff)
parent36725cb091c51104e74d1008097e5d4d10ff372f (diff)
downloadlinux-d61a5d631455544d080050916db05ef66eca187e.tar.xz
Merge branch 'for-5.10/intel-ish-hid' into for-linus
- intel-ish-hid code cleanup
Diffstat (limited to 'drivers/hid')
-rw-r--r--drivers/hid/intel-ish-hid/ishtp/bus.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/hid/intel-ish-hid/ishtp/bus.c b/drivers/hid/intel-ish-hid/ishtp/bus.c
index c47c3328a0f4..bba29cd36d29 100644
--- a/drivers/hid/intel-ish-hid/ishtp/bus.c
+++ b/drivers/hid/intel-ish-hid/ishtp/bus.c
@@ -502,8 +502,6 @@ static void ishtp_bus_remove_device(struct ishtp_cl_device *device)
int ishtp_cl_driver_register(struct ishtp_cl_driver *driver,
struct module *owner)
{
- int err;
-
if (!ishtp_device_ready)
return -ENODEV;
@@ -511,11 +509,7 @@ int ishtp_cl_driver_register(struct ishtp_cl_driver *driver,
driver->driver.owner = owner;
driver->driver.bus = &ishtp_cl_bus_type;
- err = driver_register(&driver->driver);
- if (err)
- return err;
-
- return 0;
+ return driver_register(&driver->driver);
}
EXPORT_SYMBOL(ishtp_cl_driver_register);