Re: [PATCH] usb: serial: ftdi_sio: add Awinda Station and Dongle products

Frans Klaver
2014-10-10T09:12:16Z

On Fri, Oct 10, 2014 at 11:01:17AM +0200, Johan Hovold wrote:
> On Fri, Oct 10, 2014 at 10:44:54AM +0200, Frans Klaver wrote:
> > Add new IDs for the Xsens Awinda Station and Awinda Dongle.
> >
> > Cc: <stable@vger.kernel.org>
> > Signed-off-by: Frans Klaver <frans.klaver@xsens.com>
> > ---
> > drivers/usb/serial/ftdi_sio.c | 2 ++
> > drivers/usb/serial/ftdi_sio_ids.h | 2 ++
> > 2 files changed, 4 insertions(+)
> >
> > diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
> > index dc72b92..4969875 100644
> > --- a/drivers/usb/serial/ftdi_sio.c
> > +++ b/drivers/usb/serial/ftdi_sio.c
> > @@ -663,6 +663,8 @@ static const struct usb_device_id id_table_combined[] = {
> > { USB_DEVICE(FTDI_VID, XSENS_CONVERTER_7_PID) },
> > { USB_DEVICE(XSENS_VID, XSENS_CONVERTER_PID) },
> > { USB_DEVICE(XSENS_VID, XSENS_MTW_PID) },
> > + { USB_DEVICE(XSENS_VID, XSENS_AWINDA_STATION_PID) },
> > + { USB_DEVICE(XSENS_VID, XSENS_AWINDA_DONGLE_PID) },
>
> Could you keep the XSENS_VID entries sorted alphabetically here?

Sure thing. Should have been obvious.

> > { USB_DEVICE(FTDI_VID, FTDI_OMNI1509) },
> > { USB_DEVICE(MOBILITY_VID, MOBILITY_USB_SERIAL_PID) },
> > { USB_DEVICE(FTDI_VID, FTDI_ACTIVE_ROBOTS_PID) },
> > diff --git a/drivers/usb/serial/ftdi_sio_ids.h b/drivers/usb/serial/ftdi_sio_ids.h
> > index 5937b2d..be3fffe 100644
> > --- a/drivers/usb/serial/ftdi_sio_ids.h
> > +++ b/drivers/usb/serial/ftdi_sio_ids.h
> > @@ -145,6 +145,8 @@
> > #define XSENS_VID 0x2639
> > #define XSENS_CONVERTER_PID 0xD00D /* Xsens USB-serial converter */
> > #define XSENS_MTW_PID 0x0200 /* Xsens MTw */
> > +#define XSENS_AWINDA_STATION_PID 0x0101
> > +#define XSENS_AWINDA_DONGLE_PID 0x0102
>
> And sorted by PID here (even though the two current entries are not, you
> could reorder them as well).
>
> I noticed that the below PIDs use the FTDI VID. Perhaps a comment or at
> least a separating empty line would be appropriate.
>
> > #define XSENS_CONVERTER_0_PID 0xD388 /* Xsens USB converter */
> > #define XSENS_CONVERTER_1_PID 0xD389 /* Xsens Wireless Receiver */
> > #define XSENS_CONVERTER_2_PID 0xD38A

I'll move the new entries up. How about I throw in a separate patch that
cleans up stuff around the PID definitions? There's some alignment off
as well. That doesn't need to go into stable, I think.

Thanks,
Frans