hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

USB: fix codingstyle issues in include/linux/usb.h 

No logical code changes were made, but checkpatch.pl is much happier now.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Greg Kroah-Hartman 2008-01-30 15:20:32 -08:00
parent 782e70c6fc
commit 969ab2ee9d
1 changed files with 113 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

86
include/linux/usb.h
View File

@ -162,7 +162,7 @@ struct usb_interface {
unsigned needs_remote_wakeup:1; /* driver requires remote wakeup */ unsigned needs_remote_wakeup:1; /* driver requires remote wakeup */
struct device dev; /* interface specific device info */ struct device dev; /* interface specific device info */
struct device *usb_dev; /* pointer to the usb class's device, if any */ struct device *usb_dev;
int pm_usage_cnt; /* usage counter for autosuspend */ int pm_usage_cnt; /* usage counter for autosuspend */
}; };
#define to_usb_interface(d) container_of(d, struct usb_interface, dev) #define to_usb_interface(d) container_of(d, struct usb_interface, dev)
@ -276,7 +276,8 @@ struct usb_host_config {
int __usb_get_extra_descriptor(char *buffer, unsigned size, int __usb_get_extra_descriptor(char *buffer, unsigned size,
unsigned char type, void **ptr); unsigned char type, void **ptr);
#define usb_get_extra_descriptor(ifpoint, type, ptr) \ #define usb_get_extra_descriptor(ifpoint, type, ptr) \
__usb_get_extra_descriptor((ifpoint)->extra,(ifpoint)->extralen,\ __usb_get_extra_descriptor((ifpoint)->extra, \
(ifpoint)->extralen, \
type, (void **)ptr) type, (void **)ptr)
/* ----------------------------------------------------------------------- */ /* ----------------------------------------------------------------------- */
@ -388,7 +389,7 @@ struct usb_device {
unsigned can_submit:1; /* URBs may be submitted */ unsigned can_submit:1; /* URBs may be submitted */
unsigned discon_suspended:1; /* Disconnected while suspended */ unsigned discon_suspended:1; /* Disconnected while suspended */
unsigned have_langid:1; /* whether string_langid is valid */ unsigned have_langid:1; /* whether string_langid is valid */
unsigned authorized:1; /* Policy has determined we can use it */ unsigned authorized:1; /* Policy has said we can use it */
unsigned wusb:1; /* Device is Wireless USB */ unsigned wusb:1; /* Device is Wireless USB */
int string_langid; /* language ID for strings */ int string_langid; /* language ID for strings */
@ -417,7 +418,8 @@ struct usb_device {
int pm_usage_cnt; /* usage counter for autosuspend */ int pm_usage_cnt; /* usage counter for autosuspend */
u32 quirks; /* quirks of the whole device */ u32 quirks; /* quirks of the whole device */
atomic_t urbnum; /* number of URBs submitted for the whole device */ atomic_t urbnum; /* number of URBs submitted for
the whole device */
unsigned long active_duration; /* total time device is not suspended */ unsigned long active_duration; /* total time device is not suspended */
@ -517,7 +519,8 @@ extern int usb_driver_claim_interface(struct usb_driver *driver,
* may need to explicitly claim that lock. * may need to explicitly claim that lock.
* *
*/ */
static inline int usb_interface_claimed(struct usb_interface *iface) { static inline int usb_interface_claimed(struct usb_interface *iface)
{
return (iface->dev.driver != NULL); return (iface->dev.driver != NULL);
} }
@ -560,8 +563,7 @@ extern struct usb_host_interface *usb_altnum_to_altsetting(
* USB 2.0 root hubs (EHCI host controllers) will get one path ID if they are * USB 2.0 root hubs (EHCI host controllers) will get one path ID if they are
* high speed, and a different one if they are full or low speed. * high speed, and a different one if they are full or low speed.
*/ */
static inline int usb_make_path (struct usb_device *dev, char *buf, static inline int usb_make_path(struct usb_device *dev, char *buf, size_t size)
size_t size)
{ {
int actual; int actual;
actual = snprintf(buf, size, "usb-%s-%s", dev->bus->bus_name, actual = snprintf(buf, size, "usb-%s-%s", dev->bus->bus_name,
@ -611,7 +613,8 @@ static inline int usb_endpoint_dir_in(const struct usb_endpoint_descriptor *epd)
* *
* Returns true if the endpoint is of type OUT, otherwise it returns false. * Returns true if the endpoint is of type OUT, otherwise it returns false.
*/ */
static inline int usb_endpoint_dir_out(const struct usb_endpoint_descriptor *epd) static inline int usb_endpoint_dir_out(
const struct usb_endpoint_descriptor *epd)
{ {
return ((epd->bEndpointAddress & USB_ENDPOINT_DIR_MASK) == USB_DIR_OUT); return ((epd->bEndpointAddress & USB_ENDPOINT_DIR_MASK) == USB_DIR_OUT);
} }
@ -622,7 +625,8 @@ static inline int usb_endpoint_dir_out(const struct usb_endpoint_descriptor *epd
* *
* Returns true if the endpoint is of type bulk, otherwise it returns false. * Returns true if the endpoint is of type bulk, otherwise it returns false.
*/ */
static inline int usb_endpoint_xfer_bulk(const struct usb_endpoint_descriptor *epd) static inline int usb_endpoint_xfer_bulk(
const struct usb_endpoint_descriptor *epd)
{ {
return ((epd->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) == return ((epd->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) ==
USB_ENDPOINT_XFER_BULK); USB_ENDPOINT_XFER_BULK);
@ -634,7 +638,8 @@ static inline int usb_endpoint_xfer_bulk(const struct usb_endpoint_descriptor *e
* *
* Returns true if the endpoint is of type control, otherwise it returns false. * Returns true if the endpoint is of type control, otherwise it returns false.
*/ */
static inline int usb_endpoint_xfer_control(const struct usb_endpoint_descriptor *epd) static inline int usb_endpoint_xfer_control(
const struct usb_endpoint_descriptor *epd)
{ {
return ((epd->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) == return ((epd->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) ==
USB_ENDPOINT_XFER_CONTROL); USB_ENDPOINT_XFER_CONTROL);
@ -647,7 +652,8 @@ static inline int usb_endpoint_xfer_control(const struct usb_endpoint_descriptor
* Returns true if the endpoint is of type interrupt, otherwise it returns * Returns true if the endpoint is of type interrupt, otherwise it returns
* false. * false.
*/ */
static inline int usb_endpoint_xfer_int(const struct usb_endpoint_descriptor *epd) static inline int usb_endpoint_xfer_int(
const struct usb_endpoint_descriptor *epd)
{ {
return ((epd->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) == return ((epd->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) ==
USB_ENDPOINT_XFER_INT); USB_ENDPOINT_XFER_INT);
@ -660,7 +666,8 @@ static inline int usb_endpoint_xfer_int(const struct usb_endpoint_descriptor *ep
* Returns true if the endpoint is of type isochronous, otherwise it returns * Returns true if the endpoint is of type isochronous, otherwise it returns
* false. * false.
*/ */
static inline int usb_endpoint_xfer_isoc(const struct usb_endpoint_descriptor *epd) static inline int usb_endpoint_xfer_isoc(
const struct usb_endpoint_descriptor *epd)
{ {
return ((epd->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) == return ((epd->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) ==
USB_ENDPOINT_XFER_ISOC); USB_ENDPOINT_XFER_ISOC);
@ -673,7 +680,8 @@ static inline int usb_endpoint_xfer_isoc(const struct usb_endpoint_descriptor *e
* Returns true if the endpoint has bulk transfer type and IN direction, * Returns true if the endpoint has bulk transfer type and IN direction,
* otherwise it returns false. * otherwise it returns false.
*/ */
static inline int usb_endpoint_is_bulk_in(const struct usb_endpoint_descriptor *epd) static inline int usb_endpoint_is_bulk_in(
const struct usb_endpoint_descriptor *epd)
{ {
return (usb_endpoint_xfer_bulk(epd) && usb_endpoint_dir_in(epd)); return (usb_endpoint_xfer_bulk(epd) && usb_endpoint_dir_in(epd));
} }
@ -685,7 +693,8 @@ static inline int usb_endpoint_is_bulk_in(const struct usb_endpoint_descriptor *
* Returns true if the endpoint has bulk transfer type and OUT direction, * Returns true if the endpoint has bulk transfer type and OUT direction,
* otherwise it returns false. * otherwise it returns false.
*/ */
static inline int usb_endpoint_is_bulk_out(const struct usb_endpoint_descriptor *epd) static inline int usb_endpoint_is_bulk_out(
const struct usb_endpoint_descriptor *epd)
{ {
return (usb_endpoint_xfer_bulk(epd) && usb_endpoint_dir_out(epd)); return (usb_endpoint_xfer_bulk(epd) && usb_endpoint_dir_out(epd));
} }
@ -697,7 +706,8 @@ static inline int usb_endpoint_is_bulk_out(const struct usb_endpoint_descriptor
* Returns true if the endpoint has interrupt transfer type and IN direction, * Returns true if the endpoint has interrupt transfer type and IN direction,
* otherwise it returns false. * otherwise it returns false.
*/ */
static inline int usb_endpoint_is_int_in(const struct usb_endpoint_descriptor *epd) static inline int usb_endpoint_is_int_in(
const struct usb_endpoint_descriptor *epd)
{ {
return (usb_endpoint_xfer_int(epd) && usb_endpoint_dir_in(epd)); return (usb_endpoint_xfer_int(epd) && usb_endpoint_dir_in(epd));
} }
@ -709,7 +719,8 @@ static inline int usb_endpoint_is_int_in(const struct usb_endpoint_descriptor *e
* Returns true if the endpoint has interrupt transfer type and OUT direction, * Returns true if the endpoint has interrupt transfer type and OUT direction,
* otherwise it returns false. * otherwise it returns false.
*/ */
static inline int usb_endpoint_is_int_out(const struct usb_endpoint_descriptor *epd) static inline int usb_endpoint_is_int_out(
const struct usb_endpoint_descriptor *epd)
{ {
return (usb_endpoint_xfer_int(epd) && usb_endpoint_dir_out(epd)); return (usb_endpoint_xfer_int(epd) && usb_endpoint_dir_out(epd));
} }
@ -721,7 +732,8 @@ static inline int usb_endpoint_is_int_out(const struct usb_endpoint_descriptor *
* Returns true if the endpoint has isochronous transfer type and IN direction, * Returns true if the endpoint has isochronous transfer type and IN direction,
* otherwise it returns false. * otherwise it returns false.
*/ */
static inline int usb_endpoint_is_isoc_in(const struct usb_endpoint_descriptor *epd) static inline int usb_endpoint_is_isoc_in(
const struct usb_endpoint_descriptor *epd)
{ {
return (usb_endpoint_xfer_isoc(epd) && usb_endpoint_dir_in(epd)); return (usb_endpoint_xfer_isoc(epd) && usb_endpoint_dir_in(epd));
} }
@ -733,7 +745,8 @@ static inline int usb_endpoint_is_isoc_in(const struct usb_endpoint_descriptor *
* Returns true if the endpoint has isochronous transfer type and OUT direction, * Returns true if the endpoint has isochronous transfer type and OUT direction,
* otherwise it returns false. * otherwise it returns false.
*/ */
static inline int usb_endpoint_is_isoc_out(const struct usb_endpoint_descriptor *epd) static inline int usb_endpoint_is_isoc_out(
const struct usb_endpoint_descriptor *epd)
{ {
return (usb_endpoint_xfer_isoc(epd) && usb_endpoint_dir_out(epd)); return (usb_endpoint_xfer_isoc(epd) && usb_endpoint_dir_out(epd));
} }
@ -764,7 +777,8 @@ static inline int usb_endpoint_is_isoc_out(const struct usb_endpoint_descriptor
* specific device. * specific device.
*/ */
#define USB_DEVICE(vend,prod) \ #define USB_DEVICE(vend,prod) \
.match_flags = USB_DEVICE_ID_MATCH_DEVICE, .idVendor = (vend), \ .match_flags = USB_DEVICE_ID_MATCH_DEVICE, \
.idVendor = (vend), \
.idProduct = (prod) .idProduct = (prod)
/** /**
* USB_DEVICE_VER - macro used to describe a specific usb device with a * USB_DEVICE_VER - macro used to describe a specific usb device with a
@ -779,8 +793,10 @@ static inline int usb_endpoint_is_isoc_out(const struct usb_endpoint_descriptor
*/ */
#define USB_DEVICE_VER(vend, prod, lo, hi) \ #define USB_DEVICE_VER(vend, prod, lo, hi) \
.match_flags = USB_DEVICE_ID_MATCH_DEVICE_AND_VERSION, \ .match_flags = USB_DEVICE_ID_MATCH_DEVICE_AND_VERSION, \
.idVendor = (vend), .idProduct = (prod), \ .idVendor = (vend), \
.bcdDevice_lo = (lo), .bcdDevice_hi = (hi) .idProduct = (prod), \
.bcdDevice_lo = (lo), \
.bcdDevice_hi = (hi)
/** /**
* USB_DEVICE_INTERFACE_PROTOCOL - macro used to describe a usb * USB_DEVICE_INTERFACE_PROTOCOL - macro used to describe a usb
@ -793,7 +809,8 @@ static inline int usb_endpoint_is_isoc_out(const struct usb_endpoint_descriptor
* specific interface protocol of devices. * specific interface protocol of devices.
*/ */
#define USB_DEVICE_INTERFACE_PROTOCOL(vend, prod, pr) \ #define USB_DEVICE_INTERFACE_PROTOCOL(vend, prod, pr) \
.match_flags = USB_DEVICE_ID_MATCH_DEVICE | USB_DEVICE_ID_MATCH_INT_PROTOCOL, \ .match_flags = USB_DEVICE_ID_MATCH_DEVICE | \
USB_DEVICE_ID_MATCH_INT_PROTOCOL, \
.idVendor = (vend), \ .idVendor = (vend), \
.idProduct = (prod), \ .idProduct = (prod), \
.bInterfaceProtocol = (pr) .bInterfaceProtocol = (pr)
@ -808,8 +825,10 @@ static inline int usb_endpoint_is_isoc_out(const struct usb_endpoint_descriptor
* specific class of devices. * specific class of devices.
*/ */
#define USB_DEVICE_INFO(cl, sc, pr) \ #define USB_DEVICE_INFO(cl, sc, pr) \
.match_flags = USB_DEVICE_ID_MATCH_DEV_INFO, .bDeviceClass = (cl), \ .match_flags = USB_DEVICE_ID_MATCH_DEV_INFO, \
.bDeviceSubClass = (sc), .bDeviceProtocol = (pr) .bDeviceClass = (cl), \
.bDeviceSubClass = (sc), \
.bDeviceProtocol = (pr)
/** /**
* USB_INTERFACE_INFO - macro used to describe a class of usb interfaces * USB_INTERFACE_INFO - macro used to describe a class of usb interfaces
@ -821,8 +840,10 @@ static inline int usb_endpoint_is_isoc_out(const struct usb_endpoint_descriptor
* specific class of interfaces. * specific class of interfaces.
*/ */
#define USB_INTERFACE_INFO(cl, sc, pr) \ #define USB_INTERFACE_INFO(cl, sc, pr) \
.match_flags = USB_DEVICE_ID_MATCH_INT_INFO, .bInterfaceClass = (cl), \ .match_flags = USB_DEVICE_ID_MATCH_INT_INFO, \
.bInterfaceSubClass = (sc), .bInterfaceProtocol = (pr) .bInterfaceClass = (cl), \
.bInterfaceSubClass = (sc), \
.bInterfaceProtocol = (pr)
/** /**
* USB_DEVICE_AND_INTERFACE_INFO - macro used to describe a specific usb device * USB_DEVICE_AND_INTERFACE_INFO - macro used to describe a specific usb device
@ -842,9 +863,11 @@ static inline int usb_endpoint_is_isoc_out(const struct usb_endpoint_descriptor
#define USB_DEVICE_AND_INTERFACE_INFO(vend, prod, cl, sc, pr) \ #define USB_DEVICE_AND_INTERFACE_INFO(vend, prod, cl, sc, pr) \
.match_flags = USB_DEVICE_ID_MATCH_INT_INFO \ .match_flags = USB_DEVICE_ID_MATCH_INT_INFO \
| USB_DEVICE_ID_MATCH_DEVICE, \ | USB_DEVICE_ID_MATCH_DEVICE, \
.idVendor = (vend), .idProduct = (prod), \ .idVendor = (vend), \
.idProduct = (prod), \
.bInterfaceClass = (cl), \ .bInterfaceClass = (cl), \
.bInterfaceSubClass = (sc), .bInterfaceProtocol = (pr) .bInterfaceSubClass = (sc), \
.bInterfaceProtocol = (pr)
/* ----------------------------------------------------------------------- */ /* ----------------------------------------------------------------------- */
@ -1245,8 +1268,7 @@ typedef void (*usb_complete_t)(struct urb *);
* when the urb is owned by the hcd, that is, since the call to * when the urb is owned by the hcd, that is, since the call to
* usb_submit_urb() till the entry into the completion routine. * usb_submit_urb() till the entry into the completion routine.
*/ */
struct urb struct urb {
{
/* private: usb core and host controller only fields in the urb */ /* private: usb core and host controller only fields in the urb */
struct kref kref; /* reference count of the URB */ struct kref kref; /* reference count of the URB */
void *hcpriv; /* private data for host controller */ void *hcpriv; /* private data for host controller */
@ -1257,10 +1279,10 @@ struct urb
/* public: documented fields in the urb that can be used by drivers */ /* public: documented fields in the urb that can be used by drivers */
struct list_head urb_list; /* list head for use by the urb's struct list_head urb_list; /* list head for use by the urb's
* current owner */ * current owner */
struct list_head anchor_list; /* the URB may be anchored by the driver */ struct list_head anchor_list; /* the URB may be anchored */
struct usb_anchor *anchor; struct usb_anchor *anchor;
struct usb_device *dev; /* (in) pointer to associated device */ struct usb_device *dev; /* (in) pointer to associated device */
struct usb_host_endpoint *ep; /* (internal) pointer to endpoint struct */ struct usb_host_endpoint *ep; /* (internal) pointer to endpoint */
unsigned int pipe; /* (in) pipe information */ unsigned int pipe; /* (in) pipe information */
int status; /* (return) non-ISO status */ int status; /* (return) non-ISO status */
unsigned int transfer_flags; /* (in) URB_SHORT_NOT_OK | ...*/ unsigned int transfer_flags; /* (in) URB_SHORT_NOT_OK | ...*/