leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

USB: fix codingstyle issues in drivers/usb/core/*.c

Browse Source 
Fixes a number of coding style issues in the remaining .c files in
drivers/usb/core/

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Greg Kroah-Hartman 2008-01-30 15:21:33 -08:00
parent 3e35bf39e0
commit 2c044a4803
6 changed files with 74 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/usb/core/buffer.c
View File

@ -58,7 +58,8 @@ int hcd_buffer_create(struct usb_hcd *hcd)
return 0; return 0;
for (i = 0; i < HCD_BUFFER_POOLS; i++) { for (i = 0; i < HCD_BUFFER_POOLS; i++) {
if (!(size = pool_max [i])) size = pool_max[i];
if (!size)
continue; continue;
snprintf(name, sizeof name, "buffer-%d", size); snprintf(name, sizeof name, "buffer-%d", size);
hcd->pool[i] = dma_pool_create(name, hcd->self.controller, hcd->pool[i] = dma_pool_create(name, hcd->self.controller,

10
drivers/usb/core/config.c
View File

@ -238,7 +238,7 @@ static int usb_parse_interface(struct device *ddev, int cfgno,
/* Allocate space for the right(?) number of endpoints */ /* Allocate space for the right(?) number of endpoints */
num_ep = num_ep_orig = alt->desc.bNumEndpoints; num_ep = num_ep_orig = alt->desc.bNumEndpoints;
alt->desc.bNumEndpoints = 0; // Use as a counter alt->desc.bNumEndpoints = 0; /* Use as a counter */
if (num_ep > USB_MAXENDPOINTS) { if (num_ep > USB_MAXENDPOINTS) {
dev_warn(ddev, "too many endpoints for config %d interface %d " dev_warn(ddev, "too many endpoints for config %d interface %d "
"altsetting %d: %d, using maximum allowed: %d\n", "altsetting %d: %d, using maximum allowed: %d\n",
@ -246,7 +246,8 @@ static int usb_parse_interface(struct device *ddev, int cfgno,
num_ep = USB_MAXENDPOINTS; num_ep = USB_MAXENDPOINTS;
} }
if (num_ep > 0) { /* Can't allocate 0 bytes */ if (num_ep > 0) {
/* Can't allocate 0 bytes */
len = sizeof(struct usb_host_endpoint) * num_ep; len = sizeof(struct usb_host_endpoint) * num_ep;
alt->endpoint = kzalloc(len, GFP_KERNEL); alt->endpoint = kzalloc(len, GFP_KERNEL);
if (!alt->endpoint) if (!alt->endpoint)
@ -475,8 +476,9 @@ static int usb_parse_configuration(struct device *ddev, int cfgidx,
return 0; return 0;
} }
// hub-only!! ... and only exported for reset/reinit path. /* hub-only!! ... and only exported for reset/reinit path.
// otherwise used internally on disconnect/destroy path * otherwise used internally on disconnect/destroy path
*/
void usb_destroy_configuration(struct usb_device *dev) void usb_destroy_configuration(struct usb_device *dev)
{ {
int c, i; int c, i;

20
drivers/usb/core/driver.c
View File

@ -299,7 +299,7 @@ static int usb_unbind_interface(struct device *dev)
* lock. * lock.
*/ */
int usb_driver_claim_interface(struct usb_driver *driver, int usb_driver_claim_interface(struct usb_driver *driver,
struct usb_interface *iface, void* priv) struct usb_interface *iface, void *priv)
{ {
struct device *dev = &iface->dev; struct device *dev = &iface->dev;
struct usb_device *udev = interface_to_usbdev(iface); struct usb_device *udev = interface_to_usbdev(iface);
@ -398,7 +398,7 @@ int usb_match_device(struct usb_device *dev, const struct usb_device_id *id)
return 0; return 0;
if ((id->match_flags & USB_DEVICE_ID_MATCH_DEV_SUBCLASS) && if ((id->match_flags & USB_DEVICE_ID_MATCH_DEV_SUBCLASS) &&
(id->bDeviceSubClass!= dev->descriptor.bDeviceSubClass)) (id->bDeviceSubClass != dev->descriptor.bDeviceSubClass))
return 0; return 0;
if ((id->match_flags & USB_DEVICE_ID_MATCH_DEV_PROTOCOL) && if ((id->match_flags & USB_DEVICE_ID_MATCH_DEV_PROTOCOL) &&
@ -586,7 +586,7 @@ static int usb_uevent(struct device *dev, struct kobj_uevent_env *env)
struct usb_device *usb_dev; struct usb_device *usb_dev;
/* driver is often null here; dev_dbg() would oops */ /* driver is often null here; dev_dbg() would oops */
pr_debug ("usb %s: uevent\n", dev->bus_id); pr_debug("usb %s: uevent\n", dev->bus_id);
if (is_usb_device(dev)) if (is_usb_device(dev))
usb_dev = to_usb_device(dev); usb_dev = to_usb_device(dev);
@ -596,11 +596,11 @@ static int usb_uevent(struct device *dev, struct kobj_uevent_env *env)
} }
if (usb_dev->devnum < 0) { if (usb_dev->devnum < 0) {
pr_debug ("usb %s: already deleted?\n", dev->bus_id); pr_debug("usb %s: already deleted?\n", dev->bus_id);
return -ENODEV; return -ENODEV;
} }
if (!usb_dev->bus) { if (!usb_dev->bus) {
pr_debug ("usb %s: bus removed?\n", dev->bus_id); pr_debug("usb %s: bus removed?\n", dev->bus_id);
return -ENODEV; return -ENODEV;
} }
@ -854,8 +854,10 @@ static int usb_suspend_interface(struct usb_interface *intf, pm_message_t msg)
dev_err(&intf->dev, "%s error %d\n", dev_err(&intf->dev, "%s error %d\n",
"suspend", status); "suspend", status);
} else { } else {
// FIXME else if there's no suspend method, disconnect... /*
// Not possible if auto_pm is set... * FIXME else if there's no suspend method, disconnect...
* Not possible if auto_pm is set...
*/
dev_warn(&intf->dev, "no suspend for driver %s?\n", dev_warn(&intf->dev, "no suspend for driver %s?\n",
driver->name); driver->name);
mark_quiesced(intf); mark_quiesced(intf);
@ -894,7 +896,7 @@ static int usb_resume_interface(struct usb_interface *intf, int reset_resume)
dev_err(&intf->dev, "%s error %d\n", dev_err(&intf->dev, "%s error %d\n",
"reset_resume", status); "reset_resume", status);
} else { } else {
// status = -EOPNOTSUPP; /* status = -EOPNOTSUPP; */
dev_warn(&intf->dev, "no %s for driver %s?\n", dev_warn(&intf->dev, "no %s for driver %s?\n",
"reset_resume", driver->name); "reset_resume", driver->name);
} }
@ -905,7 +907,7 @@ static int usb_resume_interface(struct usb_interface *intf, int reset_resume)
dev_err(&intf->dev, "%s error %d\n", dev_err(&intf->dev, "%s error %d\n",
"resume", status); "resume", status);
} else { } else {
// status = -EOPNOTSUPP; /* status = -EOPNOTSUPP; */
dev_warn(&intf->dev, "no %s for driver %s?\n", dev_warn(&intf->dev, "no %s for driver %s?\n",
"resume", driver->name); "resume", driver->name);
} }

16
drivers/usb/core/sysfs.c
View File

@ -650,21 +650,21 @@ void usb_remove_sysfs_dev_files(struct usb_device *udev)
/* Interface Accociation Descriptor fields */ /* Interface Accociation Descriptor fields */
#define usb_intf_assoc_attr(field, format_string) \ #define usb_intf_assoc_attr(field, format_string) \
static ssize_t \ static ssize_t \
show_iad_##field (struct device *dev, struct device_attribute *attr, \ show_iad_##field(struct device *dev, struct device_attribute *attr, \
char *buf) \ char *buf) \
{ \ { \
struct usb_interface *intf = to_usb_interface (dev); \ struct usb_interface *intf = to_usb_interface(dev); \
\ \
return sprintf (buf, format_string, \ return sprintf(buf, format_string, \
intf->intf_assoc->field); \ intf->intf_assoc->field); \
} \ } \
static DEVICE_ATTR(iad_##field, S_IRUGO, show_iad_##field, NULL); static DEVICE_ATTR(iad_##field, S_IRUGO, show_iad_##field, NULL);
usb_intf_assoc_attr (bFirstInterface, "%02x\n") usb_intf_assoc_attr(bFirstInterface, "%02x\n")
usb_intf_assoc_attr (bInterfaceCount, "%02d\n") usb_intf_assoc_attr(bInterfaceCount, "%02d\n")
usb_intf_assoc_attr (bFunctionClass, "%02x\n") usb_intf_assoc_attr(bFunctionClass, "%02x\n")
usb_intf_assoc_attr (bFunctionSubClass, "%02x\n") usb_intf_assoc_attr(bFunctionSubClass, "%02x\n")
usb_intf_assoc_attr (bFunctionProtocol, "%02x\n") usb_intf_assoc_attr(bFunctionProtocol, "%02x\n")
/* Interface fields */ /* Interface fields */
#define usb_intf_attr(field, format_string) \ #define usb_intf_attr(field, format_string) \

14
drivers/usb/core/urb.c
View File

@ -103,7 +103,7 @@ EXPORT_SYMBOL_GPL(usb_free_urb);
* *
* A pointer to the urb with the incremented reference counter is returned. * A pointer to the urb with the incremented reference counter is returned.
*/ */
struct urb * usb_get_urb(struct urb *urb) struct urb *usb_get_urb(struct urb *urb)
{ {
if (urb) if (urb)
kref_get(&urb->kref); kref_get(&urb->kref);
@ -288,7 +288,8 @@ int usb_submit_urb(struct urb *urb, gfp_t mem_flags)
if (!urb || urb->hcpriv || !urb->complete) if (!urb || urb->hcpriv || !urb->complete)
return -EINVAL; return -EINVAL;
if (!(dev = urb->dev) || dev->state < USB_STATE_DEFAULT) dev = urb->dev;
if ((!dev) || (dev->state < USB_STATE_DEFAULT))
return -ENODEV; return -ENODEV;
/* For now, get the endpoint from the pipe. Eventually drivers /* For now, get the endpoint from the pipe. Eventually drivers
@ -420,7 +421,7 @@ int usb_submit_urb(struct urb *urb, gfp_t mem_flags)
/* too big? */ /* too big? */
switch (dev->speed) { switch (dev->speed) {
case USB_SPEED_HIGH: /* units are microframes */ case USB_SPEED_HIGH: /* units are microframes */
// NOTE usb handles 2^15 /* NOTE usb handles 2^15 */
if (urb->interval > (1024 * 8)) if (urb->interval > (1024 * 8))
urb->interval = 1024 * 8; urb->interval = 1024 * 8;
max = 1024 * 8; max = 1024 * 8;
@ -430,12 +431,12 @@ int usb_submit_urb(struct urb *urb, gfp_t mem_flags)
if (xfertype == USB_ENDPOINT_XFER_INT) { if (xfertype == USB_ENDPOINT_XFER_INT) {
if (urb->interval > 255) if (urb->interval > 255)
return -EINVAL; return -EINVAL;
// NOTE ohci only handles up to 32 /* NOTE ohci only handles up to 32 */
max = 128; max = 128;
} else { } else {
if (urb->interval > 1024) if (urb->interval > 1024)
urb->interval = 1024; urb->interval = 1024;
// NOTE usb and ohci handle up to 2^15 /* NOTE usb and ohci handle up to 2^15 */
max = 1024; max = 1024;
} }
break; break;
@ -574,7 +575,8 @@ void usb_kill_anchored_urbs(struct usb_anchor *anchor)
spin_lock_irq(&anchor->lock); spin_lock_irq(&anchor->lock);
while (!list_empty(&anchor->urb_list)) { while (!list_empty(&anchor->urb_list)) {
victim = list_entry(anchor->urb_list.prev, struct urb, anchor_list); victim = list_entry(anchor->urb_list.prev, struct urb,
anchor_list);
/* we must make sure the URB isn't freed before we kill it*/ /* we must make sure the URB isn't freed before we kill it*/
usb_get_urb(victim); usb_get_urb(victim);
spin_unlock_irq(&anchor->lock); spin_unlock_irq(&anchor->lock);

31
drivers/usb/core/usb.c
View File

@ -116,7 +116,8 @@ EXPORT_SYMBOL_GPL(usb_ifnum_to_if);
* Don't call this function unless you are bound to the intf interface * Don't call this function unless you are bound to the intf interface
* or you have locked the device! * or you have locked the device!
*/ */
struct usb_host_interface *usb_altnum_to_altsetting(const struct usb_interface *intf, struct usb_host_interface *usb_altnum_to_altsetting(
const struct usb_interface *intf,
unsigned int altnum) unsigned int altnum)
{ {
int i; int i;
@ -134,7 +135,7 @@ struct find_interface_arg {
struct usb_interface *interface; struct usb_interface *interface;
}; };
static int __find_interface(struct device * dev, void * data) static int __find_interface(struct device *dev, void *data)
{ {
struct find_interface_arg *arg = data; struct find_interface_arg *arg = data;
struct usb_interface *intf; struct usb_interface *intf;
@ -272,8 +273,8 @@ static unsigned usb_bus_is_wusb(struct usb_bus *bus)
* *
* This call may not be used in a non-sleeping context. * This call may not be used in a non-sleeping context.
*/ */
struct usb_device * struct usb_device *usb_alloc_dev(struct usb_device *parent,
usb_alloc_dev(struct usb_device *parent, struct usb_bus *bus, unsigned port1) struct usb_bus *bus, unsigned port1)
{ {
struct usb_device *dev; struct usb_device *dev;
struct usb_hcd *usb_hcd = container_of(bus, struct usb_hcd, self); struct usb_hcd *usb_hcd = container_of(bus, struct usb_hcd, self);
@ -643,12 +644,8 @@ EXPORT_SYMBOL_GPL(__usb_get_extra_descriptor);
* *
* When the buffer is no longer used, free it with usb_buffer_free(). * When the buffer is no longer used, free it with usb_buffer_free().
*/ */
void *usb_buffer_alloc( void *usb_buffer_alloc(struct usb_device *dev, size_t size, gfp_t mem_flags,
struct usb_device *dev, dma_addr_t *dma)
size_t size,
gfp_t mem_flags,
dma_addr_t *dma
)
{ {
if (!dev || !dev->bus) if (!dev || !dev->bus)
return NULL; return NULL;
@ -667,12 +664,8 @@ EXPORT_SYMBOL_GPL(usb_buffer_alloc);
* been allocated using usb_buffer_alloc(), and the parameters must match * been allocated using usb_buffer_alloc(), and the parameters must match
* those provided in that allocation request. * those provided in that allocation request.
*/ */
void usb_buffer_free( void usb_buffer_free(struct usb_device *dev, size_t size, void *addr,
struct usb_device *dev, dma_addr_t dma)
size_t size,
void *addr,
dma_addr_t dma
)
{ {
if (!dev || !dev->bus) if (!dev || !dev->bus)
return; return;
@ -720,8 +713,8 @@ struct urb *usb_buffer_map(struct urb *urb)
urb->setup_packet, urb->setup_packet,
sizeof(struct usb_ctrlrequest), sizeof(struct usb_ctrlrequest),
DMA_TO_DEVICE); DMA_TO_DEVICE);
// FIXME generic api broken like pci, can't report errors /* FIXME generic api broken like pci, can't report errors */
// if (urb->transfer_dma == DMA_ADDR_INVALID) return 0; /* if (urb->transfer_dma == DMA_ADDR_INVALID) return 0; */
} else } else
urb->transfer_dma = ~0; urb->transfer_dma = ~0;
urb->transfer_flags |= (URB_NO_TRANSFER_DMA_MAP urb->transfer_flags |= (URB_NO_TRANSFER_DMA_MAP
@ -843,7 +836,7 @@ int usb_buffer_map_sg(const struct usb_device *dev, int is_in,
|| !controller->dma_mask) || !controller->dma_mask)
return -1; return -1;
// FIXME generic api broken like pci, can't report errors /* FIXME generic api broken like pci, can't report errors */
return dma_map_sg(controller, sg, nents, return dma_map_sg(controller, sg, nents,
is_in ? DMA_FROM_DEVICE : DMA_TO_DEVICE); is_in ? DMA_FROM_DEVICE : DMA_TO_DEVICE);
} }