iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

HID: logitech-hidpp: remove hidpp_is_connected()

Browse Source 
Remove the hidpp_is_connected() function wrapper, and have the callers
directly call hidpp_root_get_protocol_version() instead.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
This commit is contained in:
Hans de Goede 2019-03-22 08:41:39 +01:00 committed by Jiri Kosina
parent 9576af6a95
commit 090760d426
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/hid/hid-logitech-hidpp.c
View File

@ -871,11 +871,6 @@ print_version:
return 0; return 0;
} }
static bool hidpp_is_connected(struct hidpp_device *hidpp)
{
return hidpp_root_get_protocol_version(hidpp) == 0;
}
/* -------------------------------------------------------------------------- */ /* -------------------------------------------------------------------------- */
/* 0x0005: GetDeviceNameType */ /* 0x0005: GetDeviceNameType */
/* -------------------------------------------------------------------------- */ /* -------------------------------------------------------------------------- */
@ -3125,7 +3120,7 @@ static void hidpp_connect_event(struct hidpp_device *hidpp)
/* the device is already connected, we can ask for its name and /* the device is already connected, we can ask for its name and
* protocol */ * protocol */
if (!hidpp->protocol_major) { if (!hidpp->protocol_major) {
ret = !hidpp_is_connected(hidpp); ret = hidpp_root_get_protocol_version(hidpp);
if (ret) { if (ret) {
hid_err(hdev, "Can not get the protocol version.\n"); hid_err(hdev, "Can not get the protocol version.\n");
return; return;
@ -3277,7 +3272,7 @@ static int hidpp_probe(struct hid_device *hdev, const struct hid_device_id *id)
if (hidpp->quirks & HIDPP_QUIRK_UNIFYING) if (hidpp->quirks & HIDPP_QUIRK_UNIFYING)
hidpp_unifying_init(hidpp); hidpp_unifying_init(hidpp);
connected = hidpp_is_connected(hidpp); connected = hidpp_root_get_protocol_version(hidpp) == 0;
atomic_set(&hidpp->connected, connected); atomic_set(&hidpp->connected, connected);
if (!(hidpp->quirks & HIDPP_QUIRK_UNIFYING)) { if (!(hidpp->quirks & HIDPP_QUIRK_UNIFYING)) {
if (!connected) { if (!connected) {