Re: [PATCH] usb: gadget: get rid of USB_GADGET_DUALSPEED and USB_GADGET_SUPERSPEED

From: Sergei Shtylyov
Date: Wed Aug 17 2011 - 10:38:46 EST


Hello.

Michal Nazarewicz wrote:

From: Michal Nazarewicz <mina86@xxxxxxxxxx>

This commit removes the use of USB_GADGET_DUALSPEED and
USB_GADGET_SUPERSPEED Kconfig options. Those were selected
by UDC drivers which supported respective speeds.

However, since kernel now allows multiple UDC drivers to be
compiled, the options in question may no longer reflect the
state of all gadgets.

For instance, if one driver that supports dual speed is selected
and another that does not, the USB_GADGE_DUALSPEED will be set
"for both".

This commit replaces all the #ifdefs by a run-time checks made
by calling gadget_is_dualspeed().

Signed-off-by: Michal Nazarewicz <mina86@xxxxxxxxxx>
[...]

diff --git a/drivers/usb/gadget/inode.c b/drivers/usb/gadget/inode.c
index 1b24099..1869478 100644
--- a/drivers/usb/gadget/inode.c
+++ b/drivers/usb/gadget/inode.c
[...]
@@ -1015,9 +1013,8 @@ ep0_read (struct file *fd, char __user *buf, size_t len, loff_t *ptr)
if (dev->current_config) {
unsigned power;
- if (gadget_is_dualspeed(dev->gadget)
- && (dev->gadget->speed
- == USB_SPEED_HIGH))
+ if (gadget_is_dualspeed(dev->gadget) &&
+ (dev->gadget->speed == USB_SPEED_HIGH))

As Alan noted, this is quite unrelated white space change.

power = dev->hs_config->bMaxPower;
else
power = dev->config->bMaxPower;
@@ -1354,10 +1350,8 @@ static void make_qualifier (struct dev_data *dev)
memcpy (dev->rbuf, &qual, sizeof qual);
}
-#endif
-static int
-config_buf (struct dev_data *dev, u8 type, unsigned index)
+static int config_buf (struct dev_data *dev, u8 type, unsigned index)
{
int len;
int hs = 0;

WARNING: space prohibited between function name and open parenthesis '('
#291: FILE: drivers/usb/gadget/inode.c:1354:
+static int config_buf (struct dev_data *dev, u8 type, unsigned index)

total: 0 errors, 1 warnings, 400 lines checked

patches/usb-gadget-get-rid-of-USB_GADGET_DUALSPEED-and-USB_GADGET_SUPERSPEED.patch has style problems, please review.

If any of these errors are false positives, please report
them to the maintainer, see CHECKPATCH in MAINTAINERS.

WBR, Sergei
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/