usb: atm: fixed spacing and indentation coding style issues
Fixed spacing and indentation coding style issues. Signed-off-by: Nicolas Kaiser <nikai@nikai.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
parent
87eb1bead8
commit
16f76a7654
@ -48,7 +48,7 @@
|
|||||||
dev_warn(&(instance)->usb_intf->dev, \
|
dev_warn(&(instance)->usb_intf->dev, \
|
||||||
"failed assertion '%s' at line %d", \
|
"failed assertion '%s' at line %d", \
|
||||||
__stringify(x), __LINE__); \
|
__stringify(x), __LINE__); \
|
||||||
} while(0)
|
} while (0)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define usb_err(instance, format, arg...) \
|
#define usb_err(instance, format, arg...) \
|
||||||
@ -59,7 +59,7 @@
|
|||||||
dev_warn(&(instance)->usb_intf->dev , format , ## arg)
|
dev_warn(&(instance)->usb_intf->dev , format , ## arg)
|
||||||
#ifdef DEBUG
|
#ifdef DEBUG
|
||||||
#define usb_dbg(instance, format, arg...) \
|
#define usb_dbg(instance, format, arg...) \
|
||||||
dev_printk(KERN_DEBUG , &(instance)->usb_intf->dev , format , ## arg)
|
dev_printk(KERN_DEBUG , &(instance)->usb_intf->dev , format , ## arg)
|
||||||
#else
|
#else
|
||||||
#define usb_dbg(instance, format, arg...) \
|
#define usb_dbg(instance, format, arg...) \
|
||||||
do {} while (0)
|
do {} while (0)
|
||||||
@ -104,21 +104,21 @@ struct usbatm_data;
|
|||||||
/*
|
/*
|
||||||
* Assuming all methods exist and succeed, they are called in this order:
|
* Assuming all methods exist and succeed, they are called in this order:
|
||||||
*
|
*
|
||||||
* bind, heavy_init, atm_start, ..., atm_stop, unbind
|
* bind, heavy_init, atm_start, ..., atm_stop, unbind
|
||||||
*/
|
*/
|
||||||
|
|
||||||
struct usbatm_driver {
|
struct usbatm_driver {
|
||||||
const char *driver_name;
|
const char *driver_name;
|
||||||
|
|
||||||
/* init device ... can sleep, or cause probe() failure */
|
/* init device ... can sleep, or cause probe() failure */
|
||||||
int (*bind) (struct usbatm_data *, struct usb_interface *,
|
int (*bind) (struct usbatm_data *, struct usb_interface *,
|
||||||
const struct usb_device_id *id);
|
const struct usb_device_id *id);
|
||||||
|
|
||||||
/* additional device initialization that is too slow to be done in probe() */
|
/* additional device initialization that is too slow to be done in probe() */
|
||||||
int (*heavy_init) (struct usbatm_data *, struct usb_interface *);
|
int (*heavy_init) (struct usbatm_data *, struct usb_interface *);
|
||||||
|
|
||||||
/* cleanup device ... can sleep, but can't fail */
|
/* cleanup device ... can sleep, but can't fail */
|
||||||
void (*unbind) (struct usbatm_data *, struct usb_interface *);
|
void (*unbind) (struct usbatm_data *, struct usb_interface *);
|
||||||
|
|
||||||
/* init ATM device ... can sleep, or cause ATM initialization failure */
|
/* init ATM device ... can sleep, or cause ATM initialization failure */
|
||||||
int (*atm_start) (struct usbatm_data *, struct atm_dev *);
|
int (*atm_start) (struct usbatm_data *, struct atm_dev *);
|
||||||
@ -126,9 +126,9 @@ struct usbatm_driver {
|
|||||||
/* cleanup ATM device ... can sleep, but can't fail */
|
/* cleanup ATM device ... can sleep, but can't fail */
|
||||||
void (*atm_stop) (struct usbatm_data *, struct atm_dev *);
|
void (*atm_stop) (struct usbatm_data *, struct atm_dev *);
|
||||||
|
|
||||||
int bulk_in; /* bulk rx endpoint */
|
int bulk_in; /* bulk rx endpoint */
|
||||||
int isoc_in; /* isochronous rx endpoint */
|
int isoc_in; /* isochronous rx endpoint */
|
||||||
int bulk_out; /* bulk tx endpoint */
|
int bulk_out; /* bulk tx endpoint */
|
||||||
|
|
||||||
unsigned rx_padding;
|
unsigned rx_padding;
|
||||||
unsigned tx_padding;
|
unsigned tx_padding;
|
||||||
@ -156,7 +156,7 @@ struct usbatm_channel {
|
|||||||
struct usbatm_data {
|
struct usbatm_data {
|
||||||
/******************
|
/******************
|
||||||
* public fields *
|
* public fields *
|
||||||
******************/
|
******************/
|
||||||
|
|
||||||
/* mini driver */
|
/* mini driver */
|
||||||
struct usbatm_driver *driver;
|
struct usbatm_driver *driver;
|
||||||
@ -174,7 +174,7 @@ struct usbatm_data {
|
|||||||
|
|
||||||
/********************************
|
/********************************
|
||||||
* private fields - do not use *
|
* private fields - do not use *
|
||||||
********************************/
|
********************************/
|
||||||
|
|
||||||
struct kref refcount;
|
struct kref refcount;
|
||||||
struct mutex serialize;
|
struct mutex serialize;
|
||||||
|
@ -49,13 +49,13 @@ static struct usbatm_driver xusbatm_drivers[XUSBATM_DRIVERS_MAX];
|
|||||||
static struct usb_device_id xusbatm_usb_ids[XUSBATM_DRIVERS_MAX + 1];
|
static struct usb_device_id xusbatm_usb_ids[XUSBATM_DRIVERS_MAX + 1];
|
||||||
static struct usb_driver xusbatm_usb_driver;
|
static struct usb_driver xusbatm_usb_driver;
|
||||||
|
|
||||||
static struct usb_interface *xusbatm_find_intf (struct usb_device *usb_dev, int altsetting, u8 ep)
|
static struct usb_interface *xusbatm_find_intf(struct usb_device *usb_dev, int altsetting, u8 ep)
|
||||||
{
|
{
|
||||||
struct usb_host_interface *alt;
|
struct usb_host_interface *alt;
|
||||||
struct usb_interface *intf;
|
struct usb_interface *intf;
|
||||||
int i, j;
|
int i, j;
|
||||||
|
|
||||||
for(i = 0; i < usb_dev->actconfig->desc.bNumInterfaces; i++)
|
for (i = 0; i < usb_dev->actconfig->desc.bNumInterfaces; i++)
|
||||||
if ((intf = usb_dev->actconfig->interface[i]) && (alt = usb_altnum_to_altsetting(intf, altsetting)))
|
if ((intf = usb_dev->actconfig->interface[i]) && (alt = usb_altnum_to_altsetting(intf, altsetting)))
|
||||||
for (j = 0; j < alt->desc.bNumEndpoints; j++)
|
for (j = 0; j < alt->desc.bNumEndpoints; j++)
|
||||||
if (alt->endpoint[j].desc.bEndpointAddress == ep)
|
if (alt->endpoint[j].desc.bEndpointAddress == ep)
|
||||||
@ -63,7 +63,7 @@ static struct usb_interface *xusbatm_find_intf (struct usb_device *usb_dev, int
|
|||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int xusbatm_capture_intf (struct usbatm_data *usbatm, struct usb_device *usb_dev,
|
static int xusbatm_capture_intf(struct usbatm_data *usbatm, struct usb_device *usb_dev,
|
||||||
struct usb_interface *intf, int altsetting, int claim)
|
struct usb_interface *intf, int altsetting, int claim)
|
||||||
{
|
{
|
||||||
int ifnum = intf->altsetting->desc.bInterfaceNumber;
|
int ifnum = intf->altsetting->desc.bInterfaceNumber;
|
||||||
@ -80,7 +80,7 @@ static int xusbatm_capture_intf (struct usbatm_data *usbatm, struct usb_device *
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void xusbatm_release_intf (struct usb_device *usb_dev, struct usb_interface *intf, int claimed)
|
static void xusbatm_release_intf(struct usb_device *usb_dev, struct usb_interface *intf, int claimed)
|
||||||
{
|
{
|
||||||
if (claimed) {
|
if (claimed) {
|
||||||
usb_set_intfdata(intf, NULL);
|
usb_set_intfdata(intf, NULL);
|
||||||
@ -147,7 +147,7 @@ static void xusbatm_unbind(struct usbatm_data *usbatm,
|
|||||||
|
|
||||||
usb_dbg(usbatm, "%s entered\n", __func__);
|
usb_dbg(usbatm, "%s entered\n", __func__);
|
||||||
|
|
||||||
for(i = 0; i < usb_dev->actconfig->desc.bNumInterfaces; i++) {
|
for (i = 0; i < usb_dev->actconfig->desc.bNumInterfaces; i++) {
|
||||||
struct usb_interface *cur_intf = usb_dev->actconfig->interface[i];
|
struct usb_interface *cur_intf = usb_dev->actconfig->interface[i];
|
||||||
|
|
||||||
if (cur_intf && (usb_get_intfdata(cur_intf) == usbatm)) {
|
if (cur_intf && (usb_get_intfdata(cur_intf) == usbatm)) {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user