aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/hid/hid-picolcd.c
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2010-12-08 02:02:48 -0500
committerJiri Kosina <jkosina@suse.cz>2010-12-08 08:35:14 -0500
commit5bea7660bba973dc5e8e9d92b11fb1dd5b524ebf (patch)
tree511ae632c2d2c22d94956ed2d236bd8654d27ff0 /drivers/hid/hid-picolcd.c
parent33d6eb570b1f3fe5ba93cef465c5be66535c2c9a (diff)
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 <dtor@mail.ru> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid/hid-picolcd.c')
-rw-r--r--drivers/hid/hid-picolcd.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/hid/hid-picolcd.c b/drivers/hid/hid-picolcd.c
index bc2e07740628..38565fee7bf1 100644
--- a/drivers/hid/hid-picolcd.c
+++ b/drivers/hid/hid-picolcd.c
@@ -2635,7 +2635,7 @@ static int picolcd_probe(struct hid_device *hdev,
2635 goto err_cleanup_data; 2635 goto err_cleanup_data;
2636 } 2636 }
2637 2637
2638 error = hdev->ll_driver->open(hdev); 2638 error = hid_hw_open(hdev);
2639 if (error) { 2639 if (error) {
2640 dev_err(&hdev->dev, "failed to open input interrupt pipe for key and IR events\n"); 2640 dev_err(&hdev->dev, "failed to open input interrupt pipe for key and IR events\n");
2641 goto err_cleanup_hid_hw; 2641 goto err_cleanup_hid_hw;
@@ -2668,7 +2668,7 @@ err_cleanup_sysfs2:
2668err_cleanup_sysfs1: 2668err_cleanup_sysfs1:
2669 device_remove_file(&hdev->dev, &dev_attr_operation_mode_delay); 2669 device_remove_file(&hdev->dev, &dev_attr_operation_mode_delay);
2670err_cleanup_hid_ll: 2670err_cleanup_hid_ll:
2671 hdev->ll_driver->close(hdev); 2671 hid_hw_close(hdev);
2672err_cleanup_hid_hw: 2672err_cleanup_hid_hw:
2673 hid_hw_stop(hdev); 2673 hid_hw_stop(hdev);
2674err_cleanup_data: 2674err_cleanup_data:
@@ -2699,7 +2699,7 @@ static void picolcd_remove(struct hid_device *hdev)
2699 picolcd_exit_devfs(data); 2699 picolcd_exit_devfs(data);
2700 device_remove_file(&hdev->dev, &dev_attr_operation_mode); 2700 device_remove_file(&hdev->dev, &dev_attr_operation_mode);
2701 device_remove_file(&hdev->dev, &dev_attr_operation_mode_delay); 2701 device_remove_file(&hdev->dev, &dev_attr_operation_mode_delay);
2702 hdev->ll_driver->close(hdev); 2702 hid_hw_close(hdev);
2703 hid_hw_stop(hdev); 2703 hid_hw_stop(hdev);
2704 hid_set_drvdata(hdev, NULL); 2704 hid_set_drvdata(hdev, NULL);
2705 2705