aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Tissoires <benjamin.tissoires@redhat.com>2013-07-12 05:01:02 -0400
committerJiri Kosina <jkosina@suse.cz>2013-07-12 05:40:17 -0400
commitddf7540e9c3a3d65739daa339c8838fa39cf2758 (patch)
treef26fac03de87d45797ce9b0c59b9effa8e901bfe
parent3366dd9fa887ebbda4872e9554f853eaeda764be (diff)
HID: logitech-dj: use inlined helpers hid_hw_open/close
Use the inlined helpers hid_hw_open/close instead of direct calls to ->ll_driver->open() and ->ll_driver->close(). Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
-rw-r--r--drivers/hid/hid-logitech-dj.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/hid/hid-logitech-dj.c b/drivers/hid/hid-logitech-dj.c
index 5207591a598c..db3192b24e6e 100644
--- a/drivers/hid/hid-logitech-dj.c
+++ b/drivers/hid/hid-logitech-dj.c
@@ -756,10 +756,10 @@ static int logi_dj_probe(struct hid_device *hdev,
756 } 756 }
757 757
758 /* This is enabling the polling urb on the IN endpoint */ 758 /* This is enabling the polling urb on the IN endpoint */
759 retval = hdev->ll_driver->open(hdev); 759 retval = hid_hw_open(hdev);
760 if (retval < 0) { 760 if (retval < 0) {
761 dev_err(&hdev->dev, "%s:hdev->ll_driver->open returned " 761 dev_err(&hdev->dev, "%s:hid_hw_open returned error:%d\n",
762 "error:%d\n", __func__, retval); 762 __func__, retval);
763 goto llopen_failed; 763 goto llopen_failed;
764 } 764 }
765 765
@@ -776,7 +776,7 @@ static int logi_dj_probe(struct hid_device *hdev,
776 return retval; 776 return retval;
777 777
778logi_dj_recv_query_paired_devices_failed: 778logi_dj_recv_query_paired_devices_failed:
779 hdev->ll_driver->close(hdev); 779 hid_hw_close(hdev);
780 780
781llopen_failed: 781llopen_failed:
782switch_to_dj_mode_fail: 782switch_to_dj_mode_fail:
@@ -818,7 +818,7 @@ static void logi_dj_remove(struct hid_device *hdev)
818 818
819 cancel_work_sync(&djrcv_dev->work); 819 cancel_work_sync(&djrcv_dev->work);
820 820
821 hdev->ll_driver->close(hdev); 821 hid_hw_close(hdev);
822 hid_hw_stop(hdev); 822 hid_hw_stop(hdev);
823 823
824 /* I suppose that at this point the only context that can access 824 /* I suppose that at this point the only context that can access