[PATCH resend 1/2] usb: serial: xsens_mt: add author and description

[PATCH resend 1/2] usb: serial: xsens_mt: add author and description

[Frans Klaver]

Signed-off-by: Frans Klaver <frans.klaver@xsens.com>
---
 drivers/usb/serial/xsens_mt.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/usb/serial/xsens_mt.c b/drivers/usb/serial/xsens_mt.c
index 4841fb5..d500ccd 100644
--- a/drivers/usb/serial/xsens_mt.c
+++ b/drivers/usb/serial/xsens_mt.c
@@ -82,4 +82,6 @@ static struct usb_serial_driver * const serial_drivers[] = {
 
 module_usb_serial_driver(serial_drivers, id_table);
 
+MODULE_AUTHOR("Frans Klaver <frans.klaver@xsens.com>");
+MODULE_DESCRIPTION("USB-serial driver for Xsens motion trackers");
 MODULE_LICENSE("GPL");
-- 
2.1.0

[PATCH resend 2/2] usb: serial: xsens_mt: always bind to interface number 1

[Frans Klaver]

Probe is testing if the current interface provides two bulk endpoints.
While this achieves the goal of only binding to the correct interface,
we already know we can find the device on interface number 1. Stop
checking the endpoints and just return successfully when interface
number 1 is probed.

Signed-off-by: Frans Klaver <frans.klaver@xsens.com>
---
 drivers/usb/serial/xsens_mt.c | 23 ++++-------------------
 1 file changed, 4 insertions(+), 19 deletions(-)

diff --git a/drivers/usb/serial/xsens_mt.c b/drivers/usb/serial/xsens_mt.c
index d500ccd..ea67ed9 100644
--- a/drivers/usb/serial/xsens_mt.c
+++ b/drivers/usb/serial/xsens_mt.c
@@ -41,28 +41,13 @@ static const struct usb_device_id id_table[] = {
 };
 MODULE_DEVICE_TABLE(usb, id_table);
 
-static int has_required_endpoints(const struct usb_host_interface *interface)
-{
-	__u8 i;
-	int has_bulk_in = 0;
-	int has_bulk_out = 0;
-
-	for (i = 0; i < interface->desc.bNumEndpoints; ++i) {
-		if (usb_endpoint_is_bulk_in(&interface->endpoint[i].desc))
-			has_bulk_in = 1;
-		else if (usb_endpoint_is_bulk_out(&interface->endpoint[i].desc))
-			has_bulk_out = 1;
-	}
-
-	return has_bulk_in && has_bulk_out;
-}
-
 static int xsens_mt_probe(struct usb_serial *serial,
 					const struct usb_device_id *id)
 {
-	if (!has_required_endpoints(serial->interface->cur_altsetting))
-		return -ENODEV;
-	return 0;
+	if (serial->interface->cur_altsetting.desc.bInterfaceNumber == 1)
+		return 0;
+
+	return -ENODEV;
 }
 
 static struct usb_serial_driver xsens_mt_device = {
-- 
2.1.0

Re: [PATCH resend 2/2] usb: serial: xsens_mt: always bind to interface number 1

[Frans Klaver]

Johan,

I noticed I submitted an error here. Will resend later today.

On Mon, Sep 1, 2014 at 11:39 AM, Frans Klaver <frans.klaver@xsens.com> wrote:
> Probe is testing if the current interface provides two bulk endpoints.
> While this achieves the goal of only binding to the correct interface,
> we already know we can find the device on interface number 1. Stop
> checking the endpoints and just return successfully when interface
> number 1 is probed.
>
> Signed-off-by: Frans Klaver <frans.klaver@xsens.com>
> ---
>  drivers/usb/serial/xsens_mt.c | 23 ++++-------------------
>  1 file changed, 4 insertions(+), 19 deletions(-)
>
> diff --git a/drivers/usb/serial/xsens_mt.c b/drivers/usb/serial/xsens_mt.c
> index d500ccd..ea67ed9 100644
> --- a/drivers/usb/serial/xsens_mt.c
> +++ b/drivers/usb/serial/xsens_mt.c
> @@ -41,28 +41,13 @@ static const struct usb_device_id id_table[] = {
>  };
>  MODULE_DEVICE_TABLE(usb, id_table);
>
> -static int has_required_endpoints(const struct usb_host_interface *interface)
> -{
> -       __u8 i;
> -       int has_bulk_in = 0;
> -       int has_bulk_out = 0;
> -
> -       for (i = 0; i < interface->desc.bNumEndpoints; ++i) {
> -               if (usb_endpoint_is_bulk_in(&interface->endpoint[i].desc))
> -                       has_bulk_in = 1;
> -               else if (usb_endpoint_is_bulk_out(&interface->endpoint[i].desc))
> -                       has_bulk_out = 1;
> -       }
> -
> -       return has_bulk_in && has_bulk_out;
> -}
> -
>  static int xsens_mt_probe(struct usb_serial *serial,
>                                         const struct usb_device_id *id)
>  {
> -       if (!has_required_endpoints(serial->interface->cur_altsetting))
> -               return -ENODEV;
> -       return 0;
> +       if (serial->interface->cur_altsetting.desc.bInterfaceNumber == 1)

This should be

if (serial->interface->cur_altsetting->desc.bInterfaceNumber == 1)


> +               return 0;
> +
> +       return -ENODEV;
>  }
>
>  static struct usb_serial_driver xsens_mt_device = {
> --
> 2.1.0
>

[PATCH 2/2] usb: serial: xsens_mt: always bind to interface number 1

[Frans Klaver]

Probe is testing if the current interface provides two bulk endpoints.
While this achieves the goal of only binding to the correct interface,
we already know we can find the device on interface number 1. Stop
checking the endpoints and just return successfully when interface
number 1 is probed.

Signed-off-by: Frans Klaver <frans.klaver@xsens.com>
---
 drivers/usb/serial/xsens_mt.c | 23 ++++-------------------
 1 file changed, 4 insertions(+), 19 deletions(-)

diff --git a/drivers/usb/serial/xsens_mt.c b/drivers/usb/serial/xsens_mt.c
index d500ccd..3837d51 100644
--- a/drivers/usb/serial/xsens_mt.c
+++ b/drivers/usb/serial/xsens_mt.c
@@ -41,28 +41,13 @@ static const struct usb_device_id id_table[] = {
 };
 MODULE_DEVICE_TABLE(usb, id_table);
 
-static int has_required_endpoints(const struct usb_host_interface *interface)
-{
-	__u8 i;
-	int has_bulk_in = 0;
-	int has_bulk_out = 0;
-
-	for (i = 0; i < interface->desc.bNumEndpoints; ++i) {
-		if (usb_endpoint_is_bulk_in(&interface->endpoint[i].desc))
-			has_bulk_in = 1;
-		else if (usb_endpoint_is_bulk_out(&interface->endpoint[i].desc))
-			has_bulk_out = 1;
-	}
-
-	return has_bulk_in && has_bulk_out;
-}
-
 static int xsens_mt_probe(struct usb_serial *serial,
 					const struct usb_device_id *id)
 {
-	if (!has_required_endpoints(serial->interface->cur_altsetting))
-		return -ENODEV;
-	return 0;
+	if (serial->interface->cur_altsetting->desc.bInterfaceNumber == 1)
+		return 0;
+
+	return -ENODEV;
 }
 
 static struct usb_serial_driver xsens_mt_device = {
-- 
2.1.0

Re: [PATCH resend 2/2] usb: serial: xsens_mt: always bind to interface number 1

[Johan Hovold]

On Thu, Sep 04, 2014 at 09:12:05AM +0200, Frans Klaver wrote:

> >  static int xsens_mt_probe(struct usb_serial *serial,
> >                                         const struct usb_device_id *id)
> >  {
> > -       if (!has_required_endpoints(serial->interface->cur_altsetting))
> > -               return -ENODEV;
> > -       return 0;
> > +       if (serial->interface->cur_altsetting.desc.bInterfaceNumber == 1)
> 
> This should be
> 
> if (serial->interface->cur_altsetting->desc.bInterfaceNumber == 1)

So this wasn't even compile tested. Always test your patches before
submission, including trivial ones.

Is the new version tested on actual hardware?

Johan

Re: [PATCH resend 2/2] usb: serial: xsens_mt: always bind to interface number 1

[Frans Klaver]

On Thu, Sep 04, 2014 at 10:15:22AM +0200, Johan Hovold wrote:
> On Thu, Sep 04, 2014 at 09:12:05AM +0200, Frans Klaver wrote:
> 
> > >  static int xsens_mt_probe(struct usb_serial *serial,
> > >                                         const struct usb_device_id *id)
> > >  {
> > > -       if (!has_required_endpoints(serial->interface->cur_altsetting))
> > > -               return -ENODEV;
> > > -       return 0;
> > > +       if (serial->interface->cur_altsetting.desc.bInterfaceNumber == 1)
> > 
> > This should be
> > 
> > if (serial->interface->cur_altsetting->desc.bInterfaceNumber == 1)
> 
> So this wasn't even compile tested. Always test your patches before
> submission, including trivial ones.
> 
> Is the new version tested on actual hardware?

The implementation was tested (also fixed) before the first submission.
Not the patches. Looks like I've got a step to add.

The new version is applied, built and tested with some actual hardware
on 3.17-rc3.

Frans

Re: [PATCH resend 2/2] usb: serial: xsens_mt: always bind to interface number 1

[Johan Hovold]

On Thu, Sep 04, 2014 at 11:05:47AM +0200, Frans Klaver wrote:
> On Thu, Sep 04, 2014 at 10:15:22AM +0200, Johan Hovold wrote:
> > On Thu, Sep 04, 2014 at 09:12:05AM +0200, Frans Klaver wrote:
> > 
> > > >  static int xsens_mt_probe(struct usb_serial *serial,
> > > >                                         const struct usb_device_id *id)
> > > >  {
> > > > -       if (!has_required_endpoints(serial->interface->cur_altsetting))
> > > > -               return -ENODEV;
> > > > -       return 0;
> > > > +       if (serial->interface->cur_altsetting.desc.bInterfaceNumber == 1)
> > > 
> > > This should be
> > > 
> > > if (serial->interface->cur_altsetting->desc.bInterfaceNumber == 1)
> > 
> > So this wasn't even compile tested. Always test your patches before
> > submission, including trivial ones.
> > 
> > Is the new version tested on actual hardware?
> 
> The implementation was tested (also fixed) before the first submission.
> Not the patches. Looks like I've got a step to add.
> 
> The new version is applied, built and tested with some actual hardware
> on 3.17-rc3.

Good. Both patches applied now.

Thanks,
Johan

Re: [PATCH resend 2/2] usb: serial: xsens_mt: always bind to interface number 1

[Frans Klaver]

On Thu, Sep 04, 2014 at 11:22:26AM +0200, Johan Hovold wrote:
> On Thu, Sep 04, 2014 at 11:05:47AM +0200, Frans Klaver wrote:
> > 
> > The new version is applied, built and tested with some actual hardware
> > on 3.17-rc3.
> 
> Good. Both patches applied now.

Thanks again,
Frans