HID: add hid_hw_open/close/power() handlers
Subsystems (3)
PATCH 1/1 HID: add hid_hw_open/close/power() handlers
Instead of exposing the guts of hid->ll_driver relationship to HID sub-drivers provide these helpers to encapsulate the details.
Signed-off-by Dmitry Torokhov <[email protected]>
---
drivers/hid/hid-input.c | 4 ++-- drivers/hid/hid-picolcd.c | 6 +++--- drivers/hid/hid-roccat.c | 26 ++++++++++---------------- drivers/hid/hidraw.c | 21 +++++++++------------ include/linux/hid.h | 43 +++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 67 insertions(+), 33 deletions(-)
drivers/hid/hid-input.c +2 -2
@@ -817,14 +817,14 @@ static int hidinput_open(struct input_dev *dev) {struct hid_device *hid =input_get_drvdata (dev); -return hid->ll_driver->open (hid); +return hid_hw_open (hid); }static void hidinput_close (struct input_dev *dev) {struct hid_device *hid =input_get_drvdata (dev); - hid->ll_driver->close (hid); +hid_hw_close (hid); }/*
drivers/hid/hid-picolcd.c +3 -3
@@ -2635,7 +2635,7 @@ static int picolcd_probe(struct hid_device *hdev, goto err_cleanup_data; } - error = hdev->ll_driver->open (hdev); + error =hid_hw_open (hdev);if (error) {dev_err (&hdev->dev,"failed to open input interrupt pipe for key and IR events\n" ); goto err_cleanup_hid_hw;
@@ -2668,7 +2668,7 @@ err_cleanup_sysfs2: err_cleanup_sysfs1:device_remove_file (&hdev->dev, &dev_attr_operation_mode_delay); err_cleanup_hid_ll: - hdev->ll_driver->close (hdev); +hid_hw_close (hdev); err_cleanup_hid_hw:hid_hw_stop (hdev); err_cleanup_data:
@@ -2699,7 +2699,7 @@ static void picolcd_remove(struct hid_device *hdev)picolcd_exit_devfs (data);device_remove_file (&hdev->dev, &dev_attr_operation_mode);device_remove_file (&hdev->dev, &dev_attr_operation_mode_delay); - hdev->ll_driver->close (hdev); +hid_hw_close (hdev);hid_hw_stop (hdev);hid_set_drvdata (hdev,NULL );
drivers/hid/hid-roccat.c +10 -16
@@ -173,19 +173,15 @@ static int roccat_open(struct inode *inode, struct file *file)if (!device->open++) {/* power on device on adding first reader */ -if (device->hid->ll_driver->power) { - error = device->hid->ll_driver->power (device->hid, -PM_HINT_FULLON ); -if (error <0 ) { - --device->open; - goto exit_err; - } + error =hid_hw_power (device->hid,PM_HINT_FULLON ); +if (error <0 ) { + --device->open; + goto exit_err; } - error = device->hid->ll_driver->open (device->hid); + + error =hid_hw_open (device->hid);if (error <0 ) { -if (device->hid->ll_driver->power) - device->hid->ll_driver->power (device->hid, -PM_HINT_NORMAL ); +hid_hw_power (device->hid,PM_HINT_NORMAL ); --device->open; goto exit_err; }
@@ -231,10 +227,8 @@ static int roccat_release(struct inode *inode, struct file *file)if (!--device->open) {/* removing last reader */ if (device->exist) { -if (device->hid->ll_driver->power) - device->hid->ll_driver->power (device->hid, -PM_HINT_NORMAL ); - device->hid->ll_driver->close (device->hid); +hid_hw_power (device->hid,PM_HINT_NORMAL ); +hid_hw_close (device->hid); }else {kfree (device); }
@@ -370,7 +364,7 @@ void roccat_disconnect(int minor)device_destroy (roccat_class,MKDEV (roccat_major, minor));if (device->open) { - device->hid->ll_driver->close (device->hid); +hid_hw_close (device->hid);wake_up_interruptible (&device->wait); }else {kfree (device);
drivers/hid/hidraw.c +9 -12
@@ -192,15 +192,13 @@ static int hidraw_open(struct inode *inode, struct file *file) dev = hidraw_table[minor];if (!dev->open++) { -if (dev->hid->ll_driver->power) { - err = dev->hid->ll_driver->power (dev->hid,PM_HINT_FULLON ); -if (err <0 ) - goto out_unlock; - } - err = dev->hid->ll_driver->open (dev->hid); + err =hid_hw_power (dev->hid,PM_HINT_FULLON ); +if (err <0 ) + goto out_unlock; + + err =hid_hw_open (dev->hid);if (err <0 ) { -if (dev->hid->ll_driver->power) - dev->hid->ll_driver->power (dev->hid,PM_HINT_NORMAL ); +hid_hw_power (dev->hid,PM_HINT_NORMAL ); dev->open--; } }
@@ -229,9 +227,8 @@ static int hidraw_release(struct inode * inode, struct file * file) dev = hidraw_table[minor];if (!--dev->open) {if (list->hidraw->exist) { -if (dev->hid->ll_driver->power) - dev->hid->ll_driver->power (dev->hid,PM_HINT_NORMAL ); - dev->hid->ll_driver->close (dev->hid); +hid_hw_power (dev->hid,PM_HINT_NORMAL ); +hid_hw_close (dev->hid); }else {kfree (list->hidraw); }
@@ -433,7 +430,7 @@ void hidraw_disconnect(struct hid_device *hid)device_destroy (hidraw_class,MKDEV (hidraw_major, hidraw->minor));if (hidraw->open) { - hid->ll_driver->close (hid); +hid_hw_close (hid);wake_up_interruptible (&hidraw->wait); }else {kfree (hidraw);
include/linux/hid.h +43 -0
49 lines not on this page · raw message
Signature · 1 line
Dmitry
Quoted 4 lines · Dmitry Torokhov
Instead of exposing the guts of
hid->ll_driverrelationship to HID sub-drivers provide these helpers to encapsulate the details.Signed-off-by Dmitry Torokhov <[email protected]>
Makes sense. Applied, thank you Dmitry.
Signature · 2 lines
Jiri Kosina SUSE Labs, Novell Inc.