diff options
author | Nicolas Kaiser <nikai@nikai.net> | 2010-06-17 05:55:49 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-08-10 17:35:35 -0400 |
commit | 16f76a7654cf603ca13543e4f914ec8b6cd9ffb2 (patch) | |
tree | ae4365b95f592676a658fd4c15c59ae29d06a7ff | |
parent | 87eb1bead832b9880126fdbea74cc8ecb22b50c0 (diff) |
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>
-rw-r--r-- | drivers/usb/atm/usbatm.h | 22 | ||||
-rw-r--r-- | drivers/usb/atm/xusbatm.c | 10 |
2 files changed, 16 insertions, 16 deletions
diff --git a/drivers/usb/atm/usbatm.h b/drivers/usb/atm/usbatm.h index 0863f85fcc26..5fc489405217 100644 --- a/drivers/usb/atm/usbatm.h +++ b/drivers/usb/atm/usbatm.h | |||
@@ -48,7 +48,7 @@ | |||
48 | dev_warn(&(instance)->usb_intf->dev, \ | 48 | dev_warn(&(instance)->usb_intf->dev, \ |
49 | "failed assertion '%s' at line %d", \ | 49 | "failed assertion '%s' at line %d", \ |
50 | __stringify(x), __LINE__); \ | 50 | __stringify(x), __LINE__); \ |
51 | } while(0) | 51 | } while (0) |
52 | #endif | 52 | #endif |
53 | 53 | ||
54 | #define usb_err(instance, format, arg...) \ | 54 | #define usb_err(instance, format, arg...) \ |
@@ -59,7 +59,7 @@ | |||
59 | dev_warn(&(instance)->usb_intf->dev , format , ## arg) | 59 | dev_warn(&(instance)->usb_intf->dev , format , ## arg) |
60 | #ifdef DEBUG | 60 | #ifdef DEBUG |
61 | #define usb_dbg(instance, format, arg...) \ | 61 | #define usb_dbg(instance, format, arg...) \ |
62 | dev_printk(KERN_DEBUG , &(instance)->usb_intf->dev , format , ## arg) | 62 | dev_printk(KERN_DEBUG , &(instance)->usb_intf->dev , format , ## arg) |
63 | #else | 63 | #else |
64 | #define usb_dbg(instance, format, arg...) \ | 64 | #define usb_dbg(instance, format, arg...) \ |
65 | do {} while (0) | 65 | do {} while (0) |
@@ -104,21 +104,21 @@ struct usbatm_data; | |||
104 | /* | 104 | /* |
105 | * Assuming all methods exist and succeed, they are called in this order: | 105 | * Assuming all methods exist and succeed, they are called in this order: |
106 | * | 106 | * |
107 | * bind, heavy_init, atm_start, ..., atm_stop, unbind | 107 | * bind, heavy_init, atm_start, ..., atm_stop, unbind |
108 | */ | 108 | */ |
109 | 109 | ||
110 | struct usbatm_driver { | 110 | struct usbatm_driver { |
111 | const char *driver_name; | 111 | const char *driver_name; |
112 | 112 | ||
113 | /* init device ... can sleep, or cause probe() failure */ | 113 | /* init device ... can sleep, or cause probe() failure */ |
114 | int (*bind) (struct usbatm_data *, struct usb_interface *, | 114 | int (*bind) (struct usbatm_data *, struct usb_interface *, |
115 | const struct usb_device_id *id); | 115 | const struct usb_device_id *id); |
116 | 116 | ||
117 | /* additional device initialization that is too slow to be done in probe() */ | 117 | /* additional device initialization that is too slow to be done in probe() */ |
118 | int (*heavy_init) (struct usbatm_data *, struct usb_interface *); | 118 | int (*heavy_init) (struct usbatm_data *, struct usb_interface *); |
119 | 119 | ||
120 | /* cleanup device ... can sleep, but can't fail */ | 120 | /* cleanup device ... can sleep, but can't fail */ |
121 | void (*unbind) (struct usbatm_data *, struct usb_interface *); | 121 | void (*unbind) (struct usbatm_data *, struct usb_interface *); |
122 | 122 | ||
123 | /* init ATM device ... can sleep, or cause ATM initialization failure */ | 123 | /* init ATM device ... can sleep, or cause ATM initialization failure */ |
124 | int (*atm_start) (struct usbatm_data *, struct atm_dev *); | 124 | int (*atm_start) (struct usbatm_data *, struct atm_dev *); |
@@ -126,9 +126,9 @@ struct usbatm_driver { | |||
126 | /* cleanup ATM device ... can sleep, but can't fail */ | 126 | /* cleanup ATM device ... can sleep, but can't fail */ |
127 | void (*atm_stop) (struct usbatm_data *, struct atm_dev *); | 127 | void (*atm_stop) (struct usbatm_data *, struct atm_dev *); |
128 | 128 | ||
129 | int bulk_in; /* bulk rx endpoint */ | 129 | int bulk_in; /* bulk rx endpoint */ |
130 | int isoc_in; /* isochronous rx endpoint */ | 130 | int isoc_in; /* isochronous rx endpoint */ |
131 | int bulk_out; /* bulk tx endpoint */ | 131 | int bulk_out; /* bulk tx endpoint */ |
132 | 132 | ||
133 | unsigned rx_padding; | 133 | unsigned rx_padding; |
134 | unsigned tx_padding; | 134 | unsigned tx_padding; |
@@ -156,7 +156,7 @@ struct usbatm_channel { | |||
156 | struct usbatm_data { | 156 | struct usbatm_data { |
157 | /****************** | 157 | /****************** |
158 | * public fields * | 158 | * public fields * |
159 | ******************/ | 159 | ******************/ |
160 | 160 | ||
161 | /* mini driver */ | 161 | /* mini driver */ |
162 | struct usbatm_driver *driver; | 162 | struct usbatm_driver *driver; |
@@ -174,7 +174,7 @@ struct usbatm_data { | |||
174 | 174 | ||
175 | /******************************** | 175 | /******************************** |
176 | * private fields - do not use * | 176 | * private fields - do not use * |
177 | ********************************/ | 177 | ********************************/ |
178 | 178 | ||
179 | struct kref refcount; | 179 | struct kref refcount; |
180 | struct mutex serialize; | 180 | struct mutex serialize; |
diff --git a/drivers/usb/atm/xusbatm.c b/drivers/usb/atm/xusbatm.c index 17d167bbd2dc..48ee0c5ff282 100644 --- a/drivers/usb/atm/xusbatm.c +++ b/drivers/usb/atm/xusbatm.c | |||
@@ -49,13 +49,13 @@ static struct usbatm_driver xusbatm_drivers[XUSBATM_DRIVERS_MAX]; | |||
49 | static struct usb_device_id xusbatm_usb_ids[XUSBATM_DRIVERS_MAX + 1]; | 49 | static struct usb_device_id xusbatm_usb_ids[XUSBATM_DRIVERS_MAX + 1]; |
50 | static struct usb_driver xusbatm_usb_driver; | 50 | static struct usb_driver xusbatm_usb_driver; |
51 | 51 | ||
52 | static struct usb_interface *xusbatm_find_intf (struct usb_device *usb_dev, int altsetting, u8 ep) | 52 | static struct usb_interface *xusbatm_find_intf(struct usb_device *usb_dev, int altsetting, u8 ep) |
53 | { | 53 | { |
54 | struct usb_host_interface *alt; | 54 | struct usb_host_interface *alt; |
55 | struct usb_interface *intf; | 55 | struct usb_interface *intf; |
56 | int i, j; | 56 | int i, j; |
57 | 57 | ||
58 | for(i = 0; i < usb_dev->actconfig->desc.bNumInterfaces; i++) | 58 | for (i = 0; i < usb_dev->actconfig->desc.bNumInterfaces; i++) |
59 | if ((intf = usb_dev->actconfig->interface[i]) && (alt = usb_altnum_to_altsetting(intf, altsetting))) | 59 | if ((intf = usb_dev->actconfig->interface[i]) && (alt = usb_altnum_to_altsetting(intf, altsetting))) |
60 | for (j = 0; j < alt->desc.bNumEndpoints; j++) | 60 | for (j = 0; j < alt->desc.bNumEndpoints; j++) |
61 | if (alt->endpoint[j].desc.bEndpointAddress == ep) | 61 | if (alt->endpoint[j].desc.bEndpointAddress == ep) |
@@ -63,7 +63,7 @@ static struct usb_interface *xusbatm_find_intf (struct usb_device *usb_dev, int | |||
63 | return NULL; | 63 | return NULL; |
64 | } | 64 | } |
65 | 65 | ||
66 | static int xusbatm_capture_intf (struct usbatm_data *usbatm, struct usb_device *usb_dev, | 66 | static int xusbatm_capture_intf(struct usbatm_data *usbatm, struct usb_device *usb_dev, |
67 | struct usb_interface *intf, int altsetting, int claim) | 67 | struct usb_interface *intf, int altsetting, int claim) |
68 | { | 68 | { |
69 | int ifnum = intf->altsetting->desc.bInterfaceNumber; | 69 | int ifnum = intf->altsetting->desc.bInterfaceNumber; |
@@ -80,7 +80,7 @@ static int xusbatm_capture_intf (struct usbatm_data *usbatm, struct usb_device * | |||
80 | return 0; | 80 | return 0; |
81 | } | 81 | } |
82 | 82 | ||
83 | static void xusbatm_release_intf (struct usb_device *usb_dev, struct usb_interface *intf, int claimed) | 83 | static void xusbatm_release_intf(struct usb_device *usb_dev, struct usb_interface *intf, int claimed) |
84 | { | 84 | { |
85 | if (claimed) { | 85 | if (claimed) { |
86 | usb_set_intfdata(intf, NULL); | 86 | usb_set_intfdata(intf, NULL); |
@@ -147,7 +147,7 @@ static void xusbatm_unbind(struct usbatm_data *usbatm, | |||
147 | 147 | ||
148 | usb_dbg(usbatm, "%s entered\n", __func__); | 148 | usb_dbg(usbatm, "%s entered\n", __func__); |
149 | 149 | ||
150 | for(i = 0; i < usb_dev->actconfig->desc.bNumInterfaces; i++) { | 150 | for (i = 0; i < usb_dev->actconfig->desc.bNumInterfaces; i++) { |
151 | struct usb_interface *cur_intf = usb_dev->actconfig->interface[i]; | 151 | struct usb_interface *cur_intf = usb_dev->actconfig->interface[i]; |
152 | 152 | ||
153 | if (cur_intf && (usb_get_intfdata(cur_intf) == usbatm)) { | 153 | if (cur_intf && (usb_get_intfdata(cur_intf) == usbatm)) { |