| Message ID | 1305807498-8785-7-git-send-email-benjamin.tissoires@enac.fr (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | bf5af9b5bba2453ff46f241e8f2e139ca79302e7 |
| Headers | show |
On Thu, 19 May 2011, Benjamin Tissoires wrote: > Stantum devices used to work with MT_CLS_STANTUM but MT_CLS_CONFIDENCE > is exactly the same. This patch switches them to this generic class, > and remove the unused MT_CLS_STANTUM. > > Signed-off-by: Benjamin Tissoires <benjamin.tissoires@enac.fr> > --- > drivers/hid/hid-multitouch.c | 9 +++------ > 1 files changed, 3 insertions(+), 6 deletions(-) > > diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c > index feeb0b7..65b92d2 100644 > --- a/drivers/hid/hid-multitouch.c > +++ b/drivers/hid/hid-multitouch.c > @@ -88,7 +88,6 @@ struct mt_class { > #define MT_CLS_DUAL_INRANGE_CONTACTNUMBER 3 > #define MT_CLS_CYPRESS 4 > #define MT_CLS_EGALAX 5 > -#define MT_CLS_STANTUM 6 > #define MT_CLS_3M 7 > #define MT_CLS_CONFIDENCE 8 > #define MT_CLS_CONFIDENCE_MINUS_ONE 9 Benjamin, is it intentional that you are leaving the hole in the numbering here? I don't think there would be any issue with re-numbering 7-10, would it?
On Fri, May 20, 2011 at 10:35, Jiri Kosina <jkosina@suse.cz> wrote: > On Thu, 19 May 2011, Benjamin Tissoires wrote: > >> Stantum devices used to work with MT_CLS_STANTUM but MT_CLS_CONFIDENCE >> is exactly the same. This patch switches them to this generic class, >> and remove the unused MT_CLS_STANTUM. >> >> Signed-off-by: Benjamin Tissoires <benjamin.tissoires@enac.fr> >> --- >> drivers/hid/hid-multitouch.c | 9 +++------ >> 1 files changed, 3 insertions(+), 6 deletions(-) >> >> diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c >> index feeb0b7..65b92d2 100644 >> --- a/drivers/hid/hid-multitouch.c >> +++ b/drivers/hid/hid-multitouch.c >> @@ -88,7 +88,6 @@ struct mt_class { >> #define MT_CLS_DUAL_INRANGE_CONTACTNUMBER 3 >> #define MT_CLS_CYPRESS 4 >> #define MT_CLS_EGALAX 5 >> -#define MT_CLS_STANTUM 6 >> #define MT_CLS_3M 7 >> #define MT_CLS_CONFIDENCE 8 >> #define MT_CLS_CONFIDENCE_MINUS_ONE 9 > > Benjamin, > > is it intentional that you are leaving the hole in the numbering here? > > I don't think there would be any issue with re-numbering 7-10, would it? Well, the first time I tried to renumber those classes (to keep them alphabetically sorted), I've been told not to do it. That's why I let the hole in this case. There won't be any issue in renumbering those classes (and we could sort them). Maybe I can just send a new patch on top of this to sort them. Cheers, Benjamin PS: and thank you very much for applying so quickly the last patches I sent. > > -- > Jiri Kosina > SUSE Labs > -- To unsubscribe from this list: send the line "unsubscribe linux-input" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Fri, 20 May 2011, Benjamin Tissoires wrote: > > is it intentional that you are leaving the hole in the numbering here? > > > > I don't think there would be any issue with re-numbering 7-10, would it? > > Well, the first time I tried to renumber those classes (to keep them > alphabetically sorted), I've been told not to do it. That's why I let > the hole in this case. > There won't be any issue in renumbering those classes (and we could sort them). > Maybe I can just send a new patch on top of this to sort them. OK. Well, I don't really care personally much, I was just wondering why leaving it unnecessarily sparse. I have applied the whole series now, thanks. > PS: and thank you very much for applying so quickly the last patches I > sent. I am preparing the tree for merge window push, so I rather have everything sorted out in the upcoming day or two. Thanks,
On Fri, May 20, 2011 at 13:37, Jiri Kosina <jkosina@suse.cz> wrote: > On Fri, 20 May 2011, Benjamin Tissoires wrote: > >> > is it intentional that you are leaving the hole in the numbering here? >> > >> > I don't think there would be any issue with re-numbering 7-10, would it? >> >> Well, the first time I tried to renumber those classes (to keep them >> alphabetically sorted), I've been told not to do it. That's why I let >> the hole in this case. >> There won't be any issue in renumbering those classes (and we could sort them). >> Maybe I can just send a new patch on top of this to sort them. > > OK. Well, I don't really care personally much, I was just wondering why > leaving it unnecessarily sparse. > > I have applied the whole series now, thanks. > >> PS: and thank you very much for applying so quickly the last patches I >> sent. > > I am preparing the tree for merge window push, so I rather have everything > sorted out in the upcoming day or two. Hi Jiri, I'll make the patch right now. I'll test against our device and send it. And I'll try not to send "last minute patch" during this merge window... ;-) Cheers, Benjamin > > Thanks, > > -- > Jiri Kosina > SUSE Labs > -- To unsubscribe from this list: send the line "unsubscribe linux-input" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c index feeb0b7..65b92d2 100644 --- a/drivers/hid/hid-multitouch.c +++ b/drivers/hid/hid-multitouch.c @@ -88,7 +88,6 @@ struct mt_class { #define MT_CLS_DUAL_INRANGE_CONTACTNUMBER 3 #define MT_CLS_CYPRESS 4 #define MT_CLS_EGALAX 5 -#define MT_CLS_STANTUM 6 #define MT_CLS_3M 7 #define MT_CLS_CONFIDENCE 8 #define MT_CLS_CONFIDENCE_MINUS_ONE 9 @@ -154,8 +153,6 @@ struct mt_class mt_classes[] = { .sn_move = 4096, .sn_pressure = 32, }, - { .name = MT_CLS_STANTUM, - .quirks = MT_QUIRK_VALID_IS_CONFIDENCE }, { .name = MT_CLS_3M, .quirks = MT_QUIRK_VALID_IS_CONFIDENCE | MT_QUIRK_SLOT_IS_CONTACTID, @@ -673,13 +670,13 @@ static const struct hid_device_id mt_devices[] = { USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH4) }, /* Stantum panels */ - { .driver_data = MT_CLS_STANTUM, + { .driver_data = MT_CLS_CONFIDENCE, HID_USB_DEVICE(USB_VENDOR_ID_STANTUM, USB_DEVICE_ID_MTP)}, - { .driver_data = MT_CLS_STANTUM, + { .driver_data = MT_CLS_CONFIDENCE, HID_USB_DEVICE(USB_VENDOR_ID_STANTUM, USB_DEVICE_ID_MTP_STM)}, - { .driver_data = MT_CLS_STANTUM, + { .driver_data = MT_CLS_CONFIDENCE, HID_USB_DEVICE(USB_VENDOR_ID_STANTUM, USB_DEVICE_ID_MTP_SITRONIX)},
Stantum devices used to work with MT_CLS_STANTUM but MT_CLS_CONFIDENCE is exactly the same. This patch switches them to this generic class, and remove the unused MT_CLS_STANTUM. Signed-off-by: Benjamin Tissoires <benjamin.tissoires@enac.fr> --- drivers/hid/hid-multitouch.c | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-)