Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-14 16:12:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

staging: greybus: hid: remove KERNEL_VERSION checks

Browse Source 
No need to support older kernel versions in the Greybus HID driver, so
remove the checks as needed, we can now rely on all of the "new" apis
being present.

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
Greg Kroah-Hartman 2016-09-08 15:46:38 +02:00
parent 887520884b
commit be21106d67
1 changed files with 0 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
drivers/staging/greybus/hid.c
View File

@ -277,23 +277,6 @@ static int gb_hid_raw_request(struct hid_device *hid, unsigned char reportnum,
}
}
#if LINUX_VERSION_CODE < KERNEL_VERSION(3,15,0)
static int gb_hid_get_raw_report(struct hid_device *hid,
unsigned char reportnum, __u8 *buf,
size_t len, unsigned char rtype)
{
return gb_hid_raw_request(hid, reportnum, buf, len, rtype,
HID_REQ_GET_REPORT);
}
static int gb_hid_output_raw_report(struct hid_device *hid, __u8 *buf,
size_t len, unsigned char rtype)
{
return gb_hid_raw_request(hid, buf[0], buf, len, rtype,
HID_REQ_SET_REPORT);
}
#endif
/* HID Callbacks */
static int gb_hid_parse(struct hid_device *hid)
{
@ -422,9 +405,7 @@ static struct hid_ll_driver gb_hid_ll_driver = {
.open = gb_hid_open,
.close = gb_hid_close,
.power = gb_hid_power,
#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,15,0)
.raw_request = gb_hid_raw_request,
#endif
};
static int gb_hid_init(struct gb_hid *ghid)
@ -444,10 +425,6 @@ static int gb_hid_init(struct gb_hid *ghid)
hid->driver_data = ghid;
hid->ll_driver = &gb_hid_ll_driver;
hid->dev.parent = &ghid->connection->bundle->dev;
#if LINUX_VERSION_CODE < KERNEL_VERSION(3,15,0)
hid->hid_get_raw_report = gb_hid_get_raw_report;
hid->hid_output_raw_report = gb_hid_output_raw_report;
#endif
// hid->bus = BUS_GREYBUS; /* Need a bustype for GREYBUS in <linux/input.h> */
/* Set HID device's name */