[Apparently I forgot to send this notification out -- I'll let you look it over before I push the first 7 patches in your set]
I'd prefer keeping the "wacom" prefix for the same reason as the prior patch. I've used the pattern from the previous patch (defining 'wacom_is_using_usb_driver' as 'hid_is_using_ll_driver' in an #else case) to remove the ifdef though. Modified patch at https://github.com/jigpu/input-wacom/commit/43f07e7055730e318d8ca1c1664a19dd1d53764b if you want to review the change. Jason --- Now instead of four in the eights place / you’ve got three, ‘Cause you added one / (That is to say, eight) to the two, / But you can’t take seven from three, / So you look at the sixty-fours.... On Mon, Mar 5, 2018 at 10:32 AM, Benjamin Tissoires <benjamin.tissoi...@redhat.com> wrote: > removes one #ifdef in the code, but it all makes it closer to upstream > > Signed-off-by: Benjamin Tissoires <benjamin.tissoi...@redhat.com> > --- > 4.5/wacom_sys.c | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) > > diff --git a/4.5/wacom_sys.c b/4.5/wacom_sys.c > index e361960..7b6c5d8 100644 > --- a/4.5/wacom_sys.c > +++ b/4.5/wacom_sys.c > @@ -42,6 +42,8 @@ static bool wacom_is_using_usb_driver(struct hid_device > *hdev) > return hdev->bus == BUS_USB && > usb_for_each_dev(hdev, __wacom_is_usb_parent); > } > + > +#define hid_is_using_ll_driver(dev, usb) wacom_is_using_usb_driver(dev) > #endif > > static int wacom_get_report(struct hid_device *hdev, u8 type, u8 *buf, > @@ -2181,11 +2183,7 @@ static void wacom_update_name(struct wacom *wacom, > const char *suffix) > if ((features->type == HID_GENERIC) && !strcmp("Wacom HID", > features->name)) { > char *product_name = wacom->hdev->name; > > -#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,14,0) > if (hid_is_using_ll_driver(wacom->hdev, &usb_hid_driver)) { > -#else > - if (wacom_is_using_usb_driver(wacom->hdev)) { > -#endif > struct usb_interface *intf = > to_usb_interface(wacom->hdev->dev.parent); > struct usb_device *dev = interface_to_usbdev(intf); > product_name = dev->product; > -- > 2.14.3 > > > ------------------------------------------------------------------------------ > Check out the vibrant tech community on one of the world's most > engaging tech sites, Slashdot.org! http://sdm.link/slashdot > _______________________________________________ > Linuxwacom-devel mailing list > Linuxwacom-devel@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel ------------------------------------------------------------------------------ Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot _______________________________________________ Linuxwacom-devel mailing list Linuxwacom-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel
