Skip to content

Commit

Permalink
usb: atm: fixed spacing and indentation coding style issues
Browse files Browse the repository at this point in the history
Fixed spacing and indentation coding style issues.

Signed-off-by: Nicolas Kaiser <nikai@nikai.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Nicolas Kaiser authored and Greg Kroah-Hartman committed Aug 10, 2010
1 parent 87eb1be commit 16f76a7
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 16 deletions.
22 changes: 11 additions & 11 deletions drivers/usb/atm/usbatm.h
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
dev_warn(&(instance)->usb_intf->dev, \
"failed assertion '%s' at line %d", \
__stringify(x), __LINE__); \
} while(0)
} while (0)
#endif

#define usb_err(instance, format, arg...) \
Expand All @@ -59,7 +59,7 @@
dev_warn(&(instance)->usb_intf->dev , format , ## arg)
#ifdef DEBUG
#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
#define usb_dbg(instance, format, arg...) \
do {} while (0)
Expand Down Expand Up @@ -104,31 +104,31 @@ struct usbatm_data;
/*
* 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 {
const char *driver_name;

/* 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);

/* 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 */
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 */
int (*atm_start) (struct usbatm_data *, struct atm_dev *);

/* cleanup ATM device ... can sleep, but can't fail */
void (*atm_stop) (struct usbatm_data *, struct atm_dev *);

int bulk_in; /* bulk rx endpoint */
int isoc_in; /* isochronous rx endpoint */
int bulk_out; /* bulk tx endpoint */
int bulk_in; /* bulk rx endpoint */
int isoc_in; /* isochronous rx endpoint */
int bulk_out; /* bulk tx endpoint */

unsigned rx_padding;
unsigned tx_padding;
Expand Down Expand Up @@ -156,7 +156,7 @@ struct usbatm_channel {
struct usbatm_data {
/******************
* public fields *
******************/
******************/

/* mini driver */
struct usbatm_driver *driver;
Expand All @@ -174,7 +174,7 @@ struct usbatm_data {

/********************************
* private fields - do not use *
********************************/
********************************/

struct kref refcount;
struct mutex serialize;
Expand Down
10 changes: 5 additions & 5 deletions drivers/usb/atm/xusbatm.c
Original file line number Diff line number Diff line change
Expand Up @@ -49,21 +49,21 @@ static struct usbatm_driver xusbatm_drivers[XUSBATM_DRIVERS_MAX];
static struct usb_device_id xusbatm_usb_ids[XUSBATM_DRIVERS_MAX + 1];
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_interface *intf;
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)))
for (j = 0; j < alt->desc.bNumEndpoints; j++)
if (alt->endpoint[j].desc.bEndpointAddress == ep)
return intf;
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)
{
int ifnum = intf->altsetting->desc.bInterfaceNumber;
Expand All @@ -80,7 +80,7 @@ static int xusbatm_capture_intf (struct usbatm_data *usbatm, struct usb_device *
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) {
usb_set_intfdata(intf, NULL);
Expand Down Expand Up @@ -147,7 +147,7 @@ static void xusbatm_unbind(struct usbatm_data *usbatm,

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];

if (cur_intf && (usb_get_intfdata(cur_intf) == usbatm)) {
Expand Down

0 comments on commit 16f76a7

Please sign in to comment.