aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/gadget/ncm.c
diff options
context:
space:
mode:
authorSebastian Andrzej Siewior <bigeasy@linutronix.de>2012-09-10 03:16:07 -0400
committerFelipe Balbi <balbi@ti.com>2012-09-10 09:43:24 -0400
commited9cbda63d45638b69ce62412e3a3c7b00644835 (patch)
tree37db67a0df54bb9d9fb26b9e8c043b21551a3830 /drivers/usb/gadget/ncm.c
parent9c6d196d5aa35e07482f23c3e37755e7a82140e0 (diff)
usb: gadget: remove usb_gadget_controller_number()
The bcdDevice field is defined as |Device release number in binary-coded decimal in the USB 2.0 specification. We use this field to distinguish the UDCs from each other. In theory this could be used on the host side to apply certain quirks if the "special" UDC in combination with this gadget is used. This hasn't been done as far as I am aware. In practice it would be better to fix the UDC driver before shipping since a later release might not need this quirk anymore. There are some driver in tree (on the host side) which use the bcdDevice field to figure out special workarounds for a given firmware revision. This seems to make sense. Therefore this patch converts all gadgets (except a few) to use the kernel version instead a random 2 or 3 plus the UDC number. The few that don't report kernel's version are: - webcam This one reports always a version 0x10 so allow it to do so in future. - nokia This one reports always 0x211. The comment says that this gadget works only if the UDC supports altsettings so I added a check for this. - serial This one reports 0x2400 + UDC number. Since the gadget version is 2.4 this could make sense. Therefore bcdDevice is 0x2400 here. I also remove various gadget_is_<name> macros which are unused. The remaining few macros should be moved to feature / bug bitfield. Acked-by: Michal Nazarewicz <mina86@mina86.com> Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> Signed-off-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'drivers/usb/gadget/ncm.c')
-rw-r--r--drivers/usb/gadget/ncm.c17
1 files changed, 0 insertions, 17 deletions
diff --git a/drivers/usb/gadget/ncm.c b/drivers/usb/gadget/ncm.c
index b21ec269b8f5..a22ad9af0565 100644
--- a/drivers/usb/gadget/ncm.c
+++ b/drivers/usb/gadget/ncm.c
@@ -139,7 +139,6 @@ static struct usb_configuration ncm_config_driver = {
139 139
140static int __init gncm_bind(struct usb_composite_dev *cdev) 140static int __init gncm_bind(struct usb_composite_dev *cdev)
141{ 141{
142 int gcnum;
143 struct usb_gadget *gadget = cdev->gadget; 142 struct usb_gadget *gadget = cdev->gadget;
144 int status; 143 int status;
145 144
@@ -148,22 +147,6 @@ static int __init gncm_bind(struct usb_composite_dev *cdev)
148 if (status < 0) 147 if (status < 0)
149 return status; 148 return status;
150 149
151 gcnum = usb_gadget_controller_number(gadget);
152 if (gcnum >= 0)
153 device_desc.bcdDevice = cpu_to_le16(0x0300 | gcnum);
154 else {
155 /* We assume that can_support_ecm() tells the truth;
156 * but if the controller isn't recognized at all then
157 * that assumption is a bit more likely to be wrong.
158 */
159 dev_warn(&gadget->dev,
160 "controller '%s' not recognized; trying %s\n",
161 gadget->name,
162 ncm_config_driver.label);
163 device_desc.bcdDevice =
164 cpu_to_le16(0x0300 | 0x0099);
165 }
166
167 /* Allocate string descriptor numbers ... note that string 150 /* Allocate string descriptor numbers ... note that string
168 * contents can be overridden by the composite_dev glue. 151 * contents can be overridden by the composite_dev glue.
169 */ 152 */