Skip to content

Commit

Permalink
HID: logitech-dj: use inlined helpers hid_hw_open/close
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Benjamin Tissoires authored and Jiri Kosina committed Jul 12, 2013
1 parent 3366dd9 commit ddf7540
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions drivers/hid/hid-logitech-dj.c
Original file line number Diff line number Diff line change
Expand Up @@ -756,10 +756,10 @@ static int logi_dj_probe(struct hid_device *hdev,
}

/* This is enabling the polling urb on the IN endpoint */
retval = hdev->ll_driver->open(hdev);
retval = hid_hw_open(hdev);
if (retval < 0) {
dev_err(&hdev->dev, "%s:hdev->ll_driver->open returned "
"error:%d\n", __func__, retval);
dev_err(&hdev->dev, "%s:hid_hw_open returned error:%d\n",
__func__, retval);
goto llopen_failed;
}

Expand All @@ -776,7 +776,7 @@ static int logi_dj_probe(struct hid_device *hdev,
return retval;

logi_dj_recv_query_paired_devices_failed:
hdev->ll_driver->close(hdev);
hid_hw_close(hdev);

llopen_failed:
switch_to_dj_mode_fail:
Expand Down Expand Up @@ -818,7 +818,7 @@ static void logi_dj_remove(struct hid_device *hdev)

cancel_work_sync(&djrcv_dev->work);

hdev->ll_driver->close(hdev);
hid_hw_close(hdev);
hid_hw_stop(hdev);

/* I suppose that at this point the only context that can access
Expand Down

0 comments on commit ddf7540

Please sign in to comment.