| Message ID | 20161031104914.1990-14-felipe.balbi@linux.intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Em Mon, 31 Oct 2016 12:48:05 +0200 Felipe Balbi <felipe.balbi@linux.intel.com> escreveu: > We have introduced a helper to calculate multiplier > value from wMaxPacketSize. Start using it. Good idea! Btw, we have something similar at em28xx, stk1160-core.c and tm6000 drivers. On them, we have this: /* high bandwidth multiplier, as encoded in highspeed endpoint descriptors */ #define hb_mult(wMaxPacketSize) (1 + (((wMaxPacketSize) >> 11) & 0x03)) PLease add the same changes for the above files on this patch. Btw, are you planning to send this patch via USB tree or via the media one? If you want to send via USB, after this change, feel free to add my ack: Acked-by: Mauro Carvalho Chehab <mchehab@s-opensource.com> > > Cc: Mauro Carvalho Chehab <mchehab@kernel.org> > Cc: <linux-media@vger.kernel.org> > Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com> > --- > drivers/media/usb/usbtv/usbtv-core.c | 7 +++++-- > 1 file changed, 5 insertions(+), 2 deletions(-) > > diff --git a/drivers/media/usb/usbtv/usbtv-core.c b/drivers/media/usb/usbtv/usbtv-core.c > index dc76fd41e00f..ceb953be0770 100644 > --- a/drivers/media/usb/usbtv/usbtv-core.c > +++ b/drivers/media/usb/usbtv/usbtv-core.c > @@ -71,6 +71,7 @@ static int usbtv_probe(struct usb_interface *intf, > int size; > struct device *dev = &intf->dev; > struct usbtv *usbtv; > + struct usb_host_endpoint *ep; > > /* Checks that the device is what we think it is. */ > if (intf->num_altsetting != 2) > @@ -78,10 +79,12 @@ static int usbtv_probe(struct usb_interface *intf, > if (intf->altsetting[1].desc.bNumEndpoints != 4) > return -ENODEV; > > + ep = &intf->altsetting[1].endpoint[0]; > + > /* Packet size is split into 11 bits of base size and count of > * extra multiplies of it.*/ > - size = usb_endpoint_maxp(&intf->altsetting[1].endpoint[0].desc); > - size = (size & 0x07ff) * (((size & 0x1800) >> 11) + 1); > + size = usb_endpoint_maxp(&ep->desc); > + size = (size & 0x07ff) * usb_endpoint_maxp_mult(&ep->desc); > > /* Device structure */ > usbtv = kzalloc(sizeof(struct usbtv), GFP_KERNEL); Thanks, Mauro -- To unsubscribe from this list: send the line "unsubscribe linux-media" 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/media/usb/usbtv/usbtv-core.c b/drivers/media/usb/usbtv/usbtv-core.c index dc76fd41e00f..ceb953be0770 100644 --- a/drivers/media/usb/usbtv/usbtv-core.c +++ b/drivers/media/usb/usbtv/usbtv-core.c @@ -71,6 +71,7 @@ static int usbtv_probe(struct usb_interface *intf, int size; struct device *dev = &intf->dev; struct usbtv *usbtv; + struct usb_host_endpoint *ep; /* Checks that the device is what we think it is. */ if (intf->num_altsetting != 2) @@ -78,10 +79,12 @@ static int usbtv_probe(struct usb_interface *intf, if (intf->altsetting[1].desc.bNumEndpoints != 4) return -ENODEV; + ep = &intf->altsetting[1].endpoint[0]; + /* Packet size is split into 11 bits of base size and count of * extra multiplies of it.*/ - size = usb_endpoint_maxp(&intf->altsetting[1].endpoint[0].desc); - size = (size & 0x07ff) * (((size & 0x1800) >> 11) + 1); + size = usb_endpoint_maxp(&ep->desc); + size = (size & 0x07ff) * usb_endpoint_maxp_mult(&ep->desc); /* Device structure */ usbtv = kzalloc(sizeof(struct usbtv), GFP_KERNEL);
We have introduced a helper to calculate multiplier value from wMaxPacketSize. Start using it. Cc: Mauro Carvalho Chehab <mchehab@kernel.org> Cc: <linux-media@vger.kernel.org> Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com> --- drivers/media/usb/usbtv/usbtv-core.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)