usbcore: trivial whitespace fixes
This patch (as844) makes some trivial whitespace fixes to a few files in usbcore. Oliver did most of the work and Alan added some tidying up. Signed-off-by: Oliver Neukum <oneukum@suse.de> Signed-off-by: Alan Stern <stern@rowland.harvard.edu> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Oliver Neukum
Greg Kroah-Hartman
Родитель
1096f780d0
Коммит
9251644ab3
|
|
@ -16,16 +16,16 @@
|
|||
|
||||
/* Active configuration fields */
|
||||
#define usb_actconfig_show(field, multiplier, format_string) \
|
||||
static ssize_t show_##field (struct device *dev, \
|
||||
static ssize_t show_##field(struct device *dev, \
|
||||
struct device_attribute *attr, char *buf) \
|
||||
{ \
|
||||
struct usb_device *udev; \
|
||||
struct usb_host_config *actconfig; \
|
||||
\
|
||||
udev = to_usb_device (dev); \
|
||||
udev = to_usb_device(dev); \
|
||||
actconfig = udev->actconfig; \
|
||||
if (actconfig) \
|
||||
return sprintf (buf, format_string, \
|
||||
return sprintf(buf, format_string, \
|
||||
actconfig->desc.field * multiplier); \
|
||||
else \
|
||||
return 0; \
|
||||
|
|
@ -35,9 +35,9 @@ static ssize_t show_##field (struct device *dev, \
|
|||
usb_actconfig_show(field, multiplier, format_string) \
|
||||
static DEVICE_ATTR(field, S_IRUGO, show_##field, NULL);
|
||||
|
||||
usb_actconfig_attr (bNumInterfaces, 1, "%2d\n")
|
||||
usb_actconfig_attr (bmAttributes, 1, "%2x\n")
|
||||
usb_actconfig_attr (bMaxPower, 2, "%3dmA\n")
|
||||
usb_actconfig_attr(bNumInterfaces, 1, "%2d\n")
|
||||
usb_actconfig_attr(bmAttributes, 1, "%2x\n")
|
||||
usb_actconfig_attr(bMaxPower, 2, "%3dmA\n")
|
||||
|
||||
static ssize_t show_configuration_string(struct device *dev,
|
||||
struct device_attribute *attr, char *buf)
|
||||
|
|
@ -45,7 +45,7 @@ static ssize_t show_configuration_string(struct device *dev,
|
|||
struct usb_device *udev;
|
||||
struct usb_host_config *actconfig;
|
||||
|
||||
udev = to_usb_device (dev);
|
||||
udev = to_usb_device(dev);
|
||||
actconfig = udev->actconfig;
|
||||
if ((!actconfig) || (!actconfig->string))
|
||||
return 0;
|
||||
|
|
@ -57,16 +57,16 @@ static DEVICE_ATTR(configuration, S_IRUGO, show_configuration_string, NULL);
|
|||
usb_actconfig_show(bConfigurationValue, 1, "%u\n");
|
||||
|
||||
static ssize_t
|
||||
set_bConfigurationValue (struct device *dev, struct device_attribute *attr,
|
||||
set_bConfigurationValue(struct device *dev, struct device_attribute *attr,
|
||||
const char *buf, size_t count)
|
||||
{
|
||||
struct usb_device *udev = to_usb_device (dev);
|
||||
struct usb_device *udev = to_usb_device(dev);
|
||||
int config, value;
|
||||
|
||||
if (sscanf (buf, "%u", &config) != 1 || config > 255)
|
||||
if (sscanf(buf, "%u", &config) != 1 || config > 255)
|
||||
return -EINVAL;
|
||||
usb_lock_device(udev);
|
||||
value = usb_set_configuration (udev, config);
|
||||
value = usb_set_configuration(udev, config);
|
||||
usb_unlock_device(udev);
|
||||
return (value < 0) ? value : count;
|
||||
}
|
||||
|
|
@ -81,7 +81,7 @@ static ssize_t show_##name(struct device *dev, \
|
|||
{ \
|
||||
struct usb_device *udev; \
|
||||
\
|
||||
udev = to_usb_device (dev); \
|
||||
udev = to_usb_device(dev); \
|
||||
return sprintf(buf, "%s\n", udev->name); \
|
||||
} \
|
||||
static DEVICE_ATTR(name, S_IRUGO, show_##name, NULL);
|
||||
|
|
@ -91,12 +91,12 @@ usb_string_attr(manufacturer);
|
|||
usb_string_attr(serial);
|
||||
|
||||
static ssize_t
|
||||
show_speed (struct device *dev, struct device_attribute *attr, char *buf)
|
||||
show_speed(struct device *dev, struct device_attribute *attr, char *buf)
|
||||
{
|
||||
struct usb_device *udev;
|
||||
char *speed;
|
||||
|
||||
udev = to_usb_device (dev);
|
||||
udev = to_usb_device(dev);
|
||||
|
||||
switch (udev->speed) {
|
||||
case USB_SPEED_LOW:
|
||||
|
|
@ -112,22 +112,22 @@ show_speed (struct device *dev, struct device_attribute *attr, char *buf)
|
|||
default:
|
||||
speed = "unknown";
|
||||
}
|
||||
return sprintf (buf, "%s\n", speed);
|
||||
return sprintf(buf, "%s\n", speed);
|
||||
}
|
||||
static DEVICE_ATTR(speed, S_IRUGO, show_speed, NULL);
|
||||
|
||||
static ssize_t
|
||||
show_devnum (struct device *dev, struct device_attribute *attr, char *buf)
|
||||
show_devnum(struct device *dev, struct device_attribute *attr, char *buf)
|
||||
{
|
||||
struct usb_device *udev;
|
||||
|
||||
udev = to_usb_device (dev);
|
||||
return sprintf (buf, "%d\n", udev->devnum);
|
||||
udev = to_usb_device(dev);
|
||||
return sprintf(buf, "%d\n", udev->devnum);
|
||||
}
|
||||
static DEVICE_ATTR(devnum, S_IRUGO, show_devnum, NULL);
|
||||
|
||||
static ssize_t
|
||||
show_version (struct device *dev, struct device_attribute *attr, char *buf)
|
||||
show_version(struct device *dev, struct device_attribute *attr, char *buf)
|
||||
{
|
||||
struct usb_device *udev;
|
||||
u16 bcdUSB;
|
||||
|
|
@ -139,25 +139,25 @@ show_version (struct device *dev, struct device_attribute *attr, char *buf)
|
|||
static DEVICE_ATTR(version, S_IRUGO, show_version, NULL);
|
||||
|
||||
static ssize_t
|
||||
show_maxchild (struct device *dev, struct device_attribute *attr, char *buf)
|
||||
show_maxchild(struct device *dev, struct device_attribute *attr, char *buf)
|
||||
{
|
||||
struct usb_device *udev;
|
||||
|
||||
udev = to_usb_device (dev);
|
||||
return sprintf (buf, "%d\n", udev->maxchild);
|
||||
udev = to_usb_device(dev);
|
||||
return sprintf(buf, "%d\n", udev->maxchild);
|
||||
}
|
||||
static DEVICE_ATTR(maxchild, S_IRUGO, show_maxchild, NULL);
|
||||
|
||||
/* Descriptor fields */
|
||||
#define usb_descriptor_attr_le16(field, format_string) \
|
||||
static ssize_t \
|
||||
show_##field (struct device *dev, struct device_attribute *attr, \
|
||||
show_##field(struct device *dev, struct device_attribute *attr, \
|
||||
char *buf) \
|
||||
{ \
|
||||
struct usb_device *udev; \
|
||||
\
|
||||
udev = to_usb_device (dev); \
|
||||
return sprintf (buf, format_string, \
|
||||
udev = to_usb_device(dev); \
|
||||
return sprintf(buf, format_string, \
|
||||
le16_to_cpu(udev->descriptor.field)); \
|
||||
} \
|
||||
static DEVICE_ATTR(field, S_IRUGO, show_##field, NULL);
|
||||
|
|
@ -168,21 +168,21 @@ usb_descriptor_attr_le16(bcdDevice, "%04x\n")
|
|||
|
||||
#define usb_descriptor_attr(field, format_string) \
|
||||
static ssize_t \
|
||||
show_##field (struct device *dev, struct device_attribute *attr, \
|
||||
show_##field(struct device *dev, struct device_attribute *attr, \
|
||||
char *buf) \
|
||||
{ \
|
||||
struct usb_device *udev; \
|
||||
\
|
||||
udev = to_usb_device (dev); \
|
||||
return sprintf (buf, format_string, udev->descriptor.field); \
|
||||
udev = to_usb_device(dev); \
|
||||
return sprintf(buf, format_string, udev->descriptor.field); \
|
||||
} \
|
||||
static DEVICE_ATTR(field, S_IRUGO, show_##field, NULL);
|
||||
|
||||
usb_descriptor_attr (bDeviceClass, "%02x\n")
|
||||
usb_descriptor_attr (bDeviceSubClass, "%02x\n")
|
||||
usb_descriptor_attr (bDeviceProtocol, "%02x\n")
|
||||
usb_descriptor_attr (bNumConfigurations, "%d\n")
|
||||
usb_descriptor_attr (bMaxPacketSize0, "%d\n")
|
||||
usb_descriptor_attr(bDeviceClass, "%02x\n")
|
||||
usb_descriptor_attr(bDeviceSubClass, "%02x\n")
|
||||
usb_descriptor_attr(bDeviceProtocol, "%02x\n")
|
||||
usb_descriptor_attr(bNumConfigurations, "%d\n")
|
||||
usb_descriptor_attr(bMaxPacketSize0, "%d\n")
|
||||
|
||||
static struct attribute *dev_attrs[] = {
|
||||
/* current configuration's attributes */
|
||||
|
|
@ -220,17 +220,17 @@ int usb_create_sysfs_dev_files(struct usb_device *udev)
|
|||
return retval;
|
||||
|
||||
if (udev->manufacturer) {
|
||||
retval = device_create_file (dev, &dev_attr_manufacturer);
|
||||
retval = device_create_file(dev, &dev_attr_manufacturer);
|
||||
if (retval)
|
||||
goto error;
|
||||
}
|
||||
if (udev->product) {
|
||||
retval = device_create_file (dev, &dev_attr_product);
|
||||
retval = device_create_file(dev, &dev_attr_product);
|
||||
if (retval)
|
||||
goto error;
|
||||
}
|
||||
if (udev->serial) {
|
||||
retval = device_create_file (dev, &dev_attr_serial);
|
||||
retval = device_create_file(dev, &dev_attr_serial);
|
||||
if (retval)
|
||||
goto error;
|
||||
}
|
||||
|
|
@ -246,7 +246,7 @@ error:
|
|||
return retval;
|
||||
}
|
||||
|
||||
void usb_remove_sysfs_dev_files (struct usb_device *udev)
|
||||
void usb_remove_sysfs_dev_files(struct usb_device *udev)
|
||||
{
|
||||
struct device *dev = &udev->dev;
|
||||
|
||||
|
|
@ -264,22 +264,22 @@ void usb_remove_sysfs_dev_files (struct usb_device *udev)
|
|||
/* Interface fields */
|
||||
#define usb_intf_attr(field, format_string) \
|
||||
static ssize_t \
|
||||
show_##field (struct device *dev, struct device_attribute *attr, \
|
||||
show_##field(struct device *dev, struct device_attribute *attr, \
|
||||
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->cur_altsetting->desc.field); \
|
||||
} \
|
||||
static DEVICE_ATTR(field, S_IRUGO, show_##field, NULL);
|
||||
|
||||
usb_intf_attr (bInterfaceNumber, "%02x\n")
|
||||
usb_intf_attr (bAlternateSetting, "%2d\n")
|
||||
usb_intf_attr (bNumEndpoints, "%02x\n")
|
||||
usb_intf_attr (bInterfaceClass, "%02x\n")
|
||||
usb_intf_attr (bInterfaceSubClass, "%02x\n")
|
||||
usb_intf_attr (bInterfaceProtocol, "%02x\n")
|
||||
usb_intf_attr(bInterfaceNumber, "%02x\n")
|
||||
usb_intf_attr(bAlternateSetting, "%2d\n")
|
||||
usb_intf_attr(bNumEndpoints, "%02x\n")
|
||||
usb_intf_attr(bInterfaceClass, "%02x\n")
|
||||
usb_intf_attr(bInterfaceSubClass, "%02x\n")
|
||||
usb_intf_attr(bInterfaceProtocol, "%02x\n")
|
||||
|
||||
static ssize_t show_interface_string(struct device *dev,
|
||||
struct device_attribute *attr, char *buf)
|
||||
|
|
@ -288,8 +288,8 @@ static ssize_t show_interface_string(struct device *dev,
|
|||
struct usb_device *udev;
|
||||
int len;
|
||||
|
||||
intf = to_usb_interface (dev);
|
||||
udev = interface_to_usbdev (intf);
|
||||
intf = to_usb_interface(dev);
|
||||
udev = interface_to_usbdev(intf);
|
||||
len = snprintf(buf, 256, "%s", intf->cur_altsetting->string);
|
||||
if (len < 0)
|
||||
return 0;
|
||||
|
|
@ -384,7 +384,7 @@ error:
|
|||
return retval;
|
||||
}
|
||||
|
||||
void usb_remove_sysfs_intf_files (struct usb_interface *intf)
|
||||
void usb_remove_sysfs_intf_files(struct usb_interface *intf)
|
||||
{
|
||||
usb_remove_intf_ep_files(intf);
|
||||
sysfs_remove_group(&intf->dev.kobj, &intf_attr_grp);
|
||||
|
|
|
|||
|
|
@ -240,10 +240,10 @@ int usb_submit_urb(struct urb *urb, gfp_t mem_flags)
|
|||
* and don't need to duplicate tests
|
||||
*/
|
||||
pipe = urb->pipe;
|
||||
temp = usb_pipetype (pipe);
|
||||
is_out = usb_pipeout (pipe);
|
||||
temp = usb_pipetype(pipe);
|
||||
is_out = usb_pipeout(pipe);
|
||||
|
||||
if (!usb_pipecontrol (pipe) && dev->state < USB_STATE_CONFIGURED)
|
||||
if (!usb_pipecontrol(pipe) && dev->state < USB_STATE_CONFIGURED)
|
||||
return -ENODEV;
|
||||
|
||||
/* FIXME there should be a sharable lock protecting us against
|
||||
|
|
@ -252,11 +252,11 @@ int usb_submit_urb(struct urb *urb, gfp_t mem_flags)
|
|||
* checks get made.)
|
||||
*/
|
||||
|
||||
max = usb_maxpacket (dev, pipe, is_out);
|
||||
max = usb_maxpacket(dev, pipe, is_out);
|
||||
if (max <= 0) {
|
||||
dev_dbg(&dev->dev,
|
||||
"bogus endpoint ep%d%s in %s (bad maxpacket %d)\n",
|
||||
usb_pipeendpoint (pipe), is_out ? "out" : "in",
|
||||
usb_pipeendpoint(pipe), is_out ? "out" : "in",
|
||||
__FUNCTION__, max);
|
||||
return -EMSGSIZE;
|
||||
}
|
||||
|
|
@ -278,11 +278,11 @@ int usb_submit_urb(struct urb *urb, gfp_t mem_flags)
|
|||
if (urb->number_of_packets <= 0)
|
||||
return -EINVAL;
|
||||
for (n = 0; n < urb->number_of_packets; n++) {
|
||||
len = urb->iso_frame_desc [n].length;
|
||||
len = urb->iso_frame_desc[n].length;
|
||||
if (len < 0 || len > max)
|
||||
return -EMSGSIZE;
|
||||
urb->iso_frame_desc [n].status = -EXDEV;
|
||||
urb->iso_frame_desc [n].actual_length = 0;
|
||||
urb->iso_frame_desc[n].status = -EXDEV;
|
||||
urb->iso_frame_desc[n].actual_length = 0;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -321,7 +321,7 @@ int usb_submit_urb(struct urb *urb, gfp_t mem_flags)
|
|||
|
||||
/* fail if submitter gave bogus flags */
|
||||
if (urb->transfer_flags != orig_flags) {
|
||||
err ("BOGUS urb flags, %x --> %x",
|
||||
err("BOGUS urb flags, %x --> %x",
|
||||
orig_flags, urb->transfer_flags);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
|
@ -372,7 +372,7 @@ int usb_submit_urb(struct urb *urb, gfp_t mem_flags)
|
|||
urb->interval = temp;
|
||||
}
|
||||
|
||||
return usb_hcd_submit_urb (urb, mem_flags);
|
||||
return usb_hcd_submit_urb(urb, mem_flags);
|
||||
}
|
||||
|
||||
/*-------------------------------------------------------------------*/
|
||||
|
|
|
|||
|
|
@ -233,7 +233,7 @@ static void usb_autosuspend_work(struct work_struct *work)
|
|||
* @parent: hub to which device is connected; null to allocate a root hub
|
||||
* @bus: bus used to access the device
|
||||
* @port1: one-based index of port; ignored for root hubs
|
||||
* Context: !in_interrupt ()
|
||||
* Context: !in_interrupt()
|
||||
*
|
||||
* Only hub drivers (including virtual root hub drivers for host
|
||||
* controllers) should ever call this.
|
||||
|
|
@ -277,22 +277,22 @@ usb_alloc_dev(struct usb_device *parent, struct usb_bus *bus, unsigned port1)
|
|||
* as stable: bus->busnum changes easily from modprobe order,
|
||||
* cardbus or pci hotplugging, and so on.
|
||||
*/
|
||||
if (unlikely (!parent)) {
|
||||
dev->devpath [0] = '0';
|
||||
if (unlikely(!parent)) {
|
||||
dev->devpath[0] = '0';
|
||||
|
||||
dev->dev.parent = bus->controller;
|
||||
sprintf (&dev->dev.bus_id[0], "usb%d", bus->busnum);
|
||||
sprintf(&dev->dev.bus_id[0], "usb%d", bus->busnum);
|
||||
} else {
|
||||
/* match any labeling on the hubs; it's one-based */
|
||||
if (parent->devpath [0] == '0')
|
||||
snprintf (dev->devpath, sizeof dev->devpath,
|
||||
if (parent->devpath[0] == '0')
|
||||
snprintf(dev->devpath, sizeof dev->devpath,
|
||||
"%d", port1);
|
||||
else
|
||||
snprintf (dev->devpath, sizeof dev->devpath,
|
||||
snprintf(dev->devpath, sizeof dev->devpath,
|
||||
"%s.%d", parent->devpath, port1);
|
||||
|
||||
dev->dev.parent = &parent->dev;
|
||||
sprintf (&dev->dev.bus_id[0], "%d-%s",
|
||||
sprintf(&dev->dev.bus_id[0], "%d-%s",
|
||||
bus->busnum, dev->devpath);
|
||||
|
||||
/* hub driver sets up TT records */
|
||||
|
|
@ -463,7 +463,7 @@ static struct usb_device *match_device(struct usb_device *dev,
|
|||
/* see if this device matches */
|
||||
if ((vendor_id == le16_to_cpu(dev->descriptor.idVendor)) &&
|
||||
(product_id == le16_to_cpu(dev->descriptor.idProduct))) {
|
||||
dev_dbg (&dev->dev, "matched this device!\n");
|
||||
dev_dbg(&dev->dev, "matched this device!\n");
|
||||
ret_dev = usb_get_dev(dev);
|
||||
goto exit;
|
||||
}
|
||||
|
|
@ -535,7 +535,7 @@ exit:
|
|||
*/
|
||||
int usb_get_current_frame_number(struct usb_device *dev)
|
||||
{
|
||||
return usb_hcd_get_frame_number (dev);
|
||||
return usb_hcd_get_frame_number(dev);
|
||||
}
|
||||
|
||||
/*-------------------------------------------------------------------*/
|
||||
|
|
@ -593,7 +593,7 @@ int __usb_get_extra_descriptor(char *buffer, unsigned size,
|
|||
*
|
||||
* 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,
|
||||
|
|
@ -602,7 +602,7 @@ void *usb_buffer_alloc (
|
|||
{
|
||||
if (!dev || !dev->bus)
|
||||
return NULL;
|
||||
return hcd_buffer_alloc (dev->bus, size, mem_flags, dma);
|
||||
return hcd_buffer_alloc(dev->bus, size, mem_flags, dma);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -616,7 +616,7 @@ void *usb_buffer_alloc (
|
|||
* been allocated using usb_buffer_alloc(), and the parameters must match
|
||||
* those provided in that allocation request.
|
||||
*/
|
||||
void usb_buffer_free (
|
||||
void usb_buffer_free(
|
||||
struct usb_device *dev,
|
||||
size_t size,
|
||||
void *addr,
|
||||
|
|
@ -627,7 +627,7 @@ void usb_buffer_free (
|
|||
return;
|
||||
if (!addr)
|
||||
return;
|
||||
hcd_buffer_free (dev->bus, size, addr, dma);
|
||||
hcd_buffer_free(dev->bus, size, addr, dma);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -647,7 +647,7 @@ void usb_buffer_free (
|
|||
* Reverse the effect of this call with usb_buffer_unmap().
|
||||
*/
|
||||
#if 0
|
||||
struct urb *usb_buffer_map (struct urb *urb)
|
||||
struct urb *usb_buffer_map(struct urb *urb)
|
||||
{
|
||||
struct usb_bus *bus;
|
||||
struct device *controller;
|
||||
|
|
@ -659,14 +659,14 @@ struct urb *usb_buffer_map (struct urb *urb)
|
|||
return NULL;
|
||||
|
||||
if (controller->dma_mask) {
|
||||
urb->transfer_dma = dma_map_single (controller,
|
||||
urb->transfer_dma = dma_map_single(controller,
|
||||
urb->transfer_buffer, urb->transfer_buffer_length,
|
||||
usb_pipein (urb->pipe)
|
||||
usb_pipein(urb->pipe)
|
||||
? DMA_FROM_DEVICE : DMA_TO_DEVICE);
|
||||
if (usb_pipecontrol (urb->pipe))
|
||||
urb->setup_dma = dma_map_single (controller,
|
||||
if (usb_pipecontrol(urb->pipe))
|
||||
urb->setup_dma = dma_map_single(controller,
|
||||
urb->setup_packet,
|
||||
sizeof (struct usb_ctrlrequest),
|
||||
sizeof(struct usb_ctrlrequest),
|
||||
DMA_TO_DEVICE);
|
||||
// FIXME generic api broken like pci, can't report errors
|
||||
// if (urb->transfer_dma == DMA_ADDR_INVALID) return 0;
|
||||
|
|
@ -689,7 +689,7 @@ struct urb *usb_buffer_map (struct urb *urb)
|
|||
* usb_buffer_dmasync - synchronize DMA and CPU view of buffer(s)
|
||||
* @urb: urb whose transfer_buffer/setup_packet will be synchronized
|
||||
*/
|
||||
void usb_buffer_dmasync (struct urb *urb)
|
||||
void usb_buffer_dmasync(struct urb *urb)
|
||||
{
|
||||
struct usb_bus *bus;
|
||||
struct device *controller;
|
||||
|
|
@ -702,14 +702,14 @@ void usb_buffer_dmasync (struct urb *urb)
|
|||
return;
|
||||
|
||||
if (controller->dma_mask) {
|
||||
dma_sync_single (controller,
|
||||
dma_sync_single(controller,
|
||||
urb->transfer_dma, urb->transfer_buffer_length,
|
||||
usb_pipein (urb->pipe)
|
||||
usb_pipein(urb->pipe)
|
||||
? DMA_FROM_DEVICE : DMA_TO_DEVICE);
|
||||
if (usb_pipecontrol (urb->pipe))
|
||||
dma_sync_single (controller,
|
||||
if (usb_pipecontrol(urb->pipe))
|
||||
dma_sync_single(controller,
|
||||
urb->setup_dma,
|
||||
sizeof (struct usb_ctrlrequest),
|
||||
sizeof(struct usb_ctrlrequest),
|
||||
DMA_TO_DEVICE);
|
||||
}
|
||||
}
|
||||
|
|
@ -722,7 +722,7 @@ void usb_buffer_dmasync (struct urb *urb)
|
|||
* Reverses the effect of usb_buffer_map().
|
||||
*/
|
||||
#if 0
|
||||
void usb_buffer_unmap (struct urb *urb)
|
||||
void usb_buffer_unmap(struct urb *urb)
|
||||
{
|
||||
struct usb_bus *bus;
|
||||
struct device *controller;
|
||||
|
|
@ -735,14 +735,14 @@ void usb_buffer_unmap (struct urb *urb)
|
|||
return;
|
||||
|
||||
if (controller->dma_mask) {
|
||||
dma_unmap_single (controller,
|
||||
dma_unmap_single(controller,
|
||||
urb->transfer_dma, urb->transfer_buffer_length,
|
||||
usb_pipein (urb->pipe)
|
||||
usb_pipein(urb->pipe)
|
||||
? DMA_FROM_DEVICE : DMA_TO_DEVICE);
|
||||
if (usb_pipecontrol (urb->pipe))
|
||||
dma_unmap_single (controller,
|
||||
if (usb_pipecontrol(urb->pipe))
|
||||
dma_unmap_single(controller,
|
||||
urb->setup_dma,
|
||||
sizeof (struct usb_ctrlrequest),
|
||||
sizeof(struct usb_ctrlrequest),
|
||||
DMA_TO_DEVICE);
|
||||
}
|
||||
urb->transfer_flags &= ~(URB_NO_TRANSFER_DMA_MAP
|
||||
|
|
@ -783,15 +783,15 @@ int usb_buffer_map_sg(const struct usb_device *dev, unsigned pipe,
|
|||
struct device *controller;
|
||||
|
||||
if (!dev
|
||||
|| usb_pipecontrol (pipe)
|
||||
|| usb_pipecontrol(pipe)
|
||||
|| !(bus = dev->bus)
|
||||
|| !(controller = bus->controller)
|
||||
|| !controller->dma_mask)
|
||||
return -1;
|
||||
|
||||
// FIXME generic api broken like pci, can't report errors
|
||||
return dma_map_sg (controller, sg, nents,
|
||||
usb_pipein (pipe) ? DMA_FROM_DEVICE : DMA_TO_DEVICE);
|
||||
return dma_map_sg(controller, sg, nents,
|
||||
usb_pipein(pipe) ? DMA_FROM_DEVICE : DMA_TO_DEVICE);
|
||||
}
|
||||
|
||||
/* XXX DISABLED, no users currently. If you wish to re-enable this
|
||||
|
|
@ -823,8 +823,8 @@ void usb_buffer_dmasync_sg(const struct usb_device *dev, unsigned pipe,
|
|||
|| !controller->dma_mask)
|
||||
return;
|
||||
|
||||
dma_sync_sg (controller, sg, n_hw_ents,
|
||||
usb_pipein (pipe) ? DMA_FROM_DEVICE : DMA_TO_DEVICE);
|
||||
dma_sync_sg(controller, sg, n_hw_ents,
|
||||
usb_pipein(pipe) ? DMA_FROM_DEVICE : DMA_TO_DEVICE);
|
||||
}
|
||||
#endif
|
||||
|
||||
|
|
@ -849,8 +849,8 @@ void usb_buffer_unmap_sg(const struct usb_device *dev, unsigned pipe,
|
|||
|| !controller->dma_mask)
|
||||
return;
|
||||
|
||||
dma_unmap_sg (controller, sg, n_hw_ents,
|
||||
usb_pipein (pipe) ? DMA_FROM_DEVICE : DMA_TO_DEVICE);
|
||||
dma_unmap_sg(controller, sg, n_hw_ents,
|
||||
usb_pipein(pipe) ? DMA_FROM_DEVICE : DMA_TO_DEVICE);
|
||||
}
|
||||
|
||||
/* format to disable USB on kernel command line is: nousb */
|
||||
|
|
@ -871,7 +871,7 @@ static int __init usb_init(void)
|
|||
{
|
||||
int retval;
|
||||
if (nousb) {
|
||||
pr_info ("%s: USB support disabled\n", usbcore_name);
|
||||
pr_info("%s: USB support disabled\n", usbcore_name);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
@ -971,19 +971,19 @@ EXPORT_SYMBOL(__usb_get_extra_descriptor);
|
|||
EXPORT_SYMBOL(usb_find_device);
|
||||
EXPORT_SYMBOL(usb_get_current_frame_number);
|
||||
|
||||
EXPORT_SYMBOL (usb_buffer_alloc);
|
||||
EXPORT_SYMBOL (usb_buffer_free);
|
||||
EXPORT_SYMBOL(usb_buffer_alloc);
|
||||
EXPORT_SYMBOL(usb_buffer_free);
|
||||
|
||||
#if 0
|
||||
EXPORT_SYMBOL (usb_buffer_map);
|
||||
EXPORT_SYMBOL (usb_buffer_dmasync);
|
||||
EXPORT_SYMBOL (usb_buffer_unmap);
|
||||
EXPORT_SYMBOL(usb_buffer_map);
|
||||
EXPORT_SYMBOL(usb_buffer_dmasync);
|
||||
EXPORT_SYMBOL(usb_buffer_unmap);
|
||||
#endif
|
||||
|
||||
EXPORT_SYMBOL (usb_buffer_map_sg);
|
||||
EXPORT_SYMBOL(usb_buffer_map_sg);
|
||||
#if 0
|
||||
EXPORT_SYMBOL (usb_buffer_dmasync_sg);
|
||||
EXPORT_SYMBOL(usb_buffer_dmasync_sg);
|
||||
#endif
|
||||
EXPORT_SYMBOL (usb_buffer_unmap_sg);
|
||||
EXPORT_SYMBOL(usb_buffer_unmap_sg);
|
||||
|
||||
MODULE_LICENSE("GPL");
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче