aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/atm
diff options
context:
space:
mode:
authorNicolas Kaiser <nikai@nikai.net>2010-06-09 14:43:03 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2010-08-10 17:35:34 -0400
commit9196cc7bb46bece079398c9846050e8c8dc9235c (patch)
tree927d11b2bc26b56416d275329786e5c2f4264c83 /drivers/usb/atm
parent6c4b7f70ba5ffb7fa1d19d2518664ea6ddb3cbf3 (diff)
USB: speedtouch: fixed more brace and spacing coding style issues
Fixed spacing coding style issues. Signed-off-by: Nicolas Kaiser <nikai@nikai.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/atm')
-rw-r--r--drivers/usb/atm/speedtch.c6
-rw-r--r--drivers/usb/atm/usbatm.c16
2 files changed, 11 insertions, 11 deletions
diff --git a/drivers/usb/atm/speedtch.c b/drivers/usb/atm/speedtch.c
index db83468bde5c..4716e707de59 100644
--- a/drivers/usb/atm/speedtch.c
+++ b/drivers/usb/atm/speedtch.c
@@ -759,7 +759,7 @@ static void speedtch_release_interfaces(struct usb_device *usb_dev,
759 struct usb_interface *cur_intf; 759 struct usb_interface *cur_intf;
760 int i; 760 int i;
761 761
762 for(i = 0; i < num_interfaces; i++) 762 for (i = 0; i < num_interfaces; i++)
763 if ((cur_intf = usb_ifnum_to_if(usb_dev, i))) { 763 if ((cur_intf = usb_ifnum_to_if(usb_dev, i))) {
764 usb_set_intfdata(cur_intf, NULL); 764 usb_set_intfdata(cur_intf, NULL);
765 usb_driver_release_interface(&speedtch_usb_driver, cur_intf); 765 usb_driver_release_interface(&speedtch_usb_driver, cur_intf);
@@ -794,7 +794,7 @@ static int speedtch_bind(struct usbatm_data *usbatm,
794 794
795 /* claim all interfaces */ 795 /* claim all interfaces */
796 796
797 for (i=0; i < num_interfaces; i++) { 797 for (i = 0; i < num_interfaces; i++) {
798 cur_intf = usb_ifnum_to_if(usb_dev, i); 798 cur_intf = usb_ifnum_to_if(usb_dev, i);
799 799
800 if ((i != ifnum) && cur_intf) { 800 if ((i != ifnum) && cur_intf) {
@@ -844,7 +844,7 @@ static int speedtch_bind(struct usbatm_data *usbatm,
844 844
845 use_isoc = 0; /* fall back to bulk if endpoint not found */ 845 use_isoc = 0; /* fall back to bulk if endpoint not found */
846 846
847 for (i=0; i<desc->desc.bNumEndpoints; i++) { 847 for (i = 0; i < desc->desc.bNumEndpoints; i++) {
848 const struct usb_endpoint_descriptor *endpoint_desc = &desc->endpoint[i].desc; 848 const struct usb_endpoint_descriptor *endpoint_desc = &desc->endpoint[i].desc;
849 849
850 if ((endpoint_desc->bEndpointAddress == target_address)) { 850 if ((endpoint_desc->bEndpointAddress == target_address)) {
diff --git a/drivers/usb/atm/usbatm.c b/drivers/usb/atm/usbatm.c
index a67166e5f671..05bf5a27b5b0 100644
--- a/drivers/usb/atm/usbatm.c
+++ b/drivers/usb/atm/usbatm.c
@@ -84,8 +84,8 @@
84 84
85#ifdef VERBOSE_DEBUG 85#ifdef VERBOSE_DEBUG
86static int usbatm_print_packet(const unsigned char *data, int len); 86static int usbatm_print_packet(const unsigned char *data, int len);
87#define PACKETDEBUG(arg...) usbatm_print_packet (arg) 87#define PACKETDEBUG(arg...) usbatm_print_packet(arg)
88#define vdbg(arg...) dbg (arg) 88#define vdbg(arg...) dbg(arg)
89#else 89#else
90#define PACKETDEBUG(arg...) 90#define PACKETDEBUG(arg...)
91#define vdbg(arg...) 91#define vdbg(arg...)
@@ -273,7 +273,7 @@ static void usbatm_complete(struct urb *urb)
273 273
274 if (unlikely(status) && 274 if (unlikely(status) &&
275 (!(channel->usbatm->flags & UDSL_IGNORE_EILSEQ) || 275 (!(channel->usbatm->flags & UDSL_IGNORE_EILSEQ) ||
276 status != -EILSEQ )) { 276 status != -EILSEQ)) {
277 if (status == -ESHUTDOWN) 277 if (status == -ESHUTDOWN)
278 return; 278 return;
279 279
@@ -493,7 +493,7 @@ static unsigned int usbatm_write_cells(struct usbatm_data *instance,
493 ptr += data_len; 493 ptr += data_len;
494 __skb_pull(skb, data_len); 494 __skb_pull(skb, data_len);
495 495
496 if(!left) 496 if (!left)
497 continue; 497 continue;
498 498
499 memset(ptr, 0, left); 499 memset(ptr, 0, left);
@@ -505,7 +505,7 @@ static unsigned int usbatm_write_cells(struct usbatm_data *instance,
505 trailer[2] = ctrl->len >> 8; 505 trailer[2] = ctrl->len >> 8;
506 trailer[3] = ctrl->len; 506 trailer[3] = ctrl->len;
507 507
508 ctrl->crc = ~ crc32_be(ctrl->crc, ptr, left - 4); 508 ctrl->crc = ~crc32_be(ctrl->crc, ptr, left - 4);
509 509
510 trailer[4] = ctrl->crc >> 24; 510 trailer[4] = ctrl->crc >> 24;
511 trailer[5] = ctrl->crc >> 16; 511 trailer[5] = ctrl->crc >> 16;
@@ -1144,7 +1144,7 @@ int usbatm_usb_probe(struct usb_interface *intf, const struct usb_device_id *id,
1144 instance->tx_channel.endpoint = usb_sndbulkpipe(usb_dev, driver->bulk_out); 1144 instance->tx_channel.endpoint = usb_sndbulkpipe(usb_dev, driver->bulk_out);
1145 1145
1146 /* tx buffer size must be a positive multiple of the stride */ 1146 /* tx buffer size must be a positive multiple of the stride */
1147 instance->tx_channel.buf_size = max (instance->tx_channel.stride, 1147 instance->tx_channel.buf_size = max(instance->tx_channel.stride,
1148 snd_buf_bytes - (snd_buf_bytes % instance->tx_channel.stride)); 1148 snd_buf_bytes - (snd_buf_bytes % instance->tx_channel.stride));
1149 1149
1150 /* rx buffer size must be a positive multiple of the endpoint maxpacket */ 1150 /* rx buffer size must be a positive multiple of the endpoint maxpacket */
@@ -1157,7 +1157,7 @@ int usbatm_usb_probe(struct usb_interface *intf, const struct usb_device_id *id,
1157 goto fail_unbind; 1157 goto fail_unbind;
1158 } 1158 }
1159 1159
1160 num_packets = max (1U, (rcv_buf_bytes + maxpacket / 2) / maxpacket); /* round */ 1160 num_packets = max(1U, (rcv_buf_bytes + maxpacket / 2) / maxpacket); /* round */
1161 1161
1162 if (num_packets * maxpacket > UDSL_MAX_BUF_SIZE) 1162 if (num_packets * maxpacket > UDSL_MAX_BUF_SIZE)
1163 num_packets--; 1163 num_packets--;
@@ -1260,7 +1260,7 @@ int usbatm_usb_probe(struct usb_interface *intf, const struct usb_device_id *id,
1260 usb_free_urb(instance->urbs[i]); 1260 usb_free_urb(instance->urbs[i]);
1261 } 1261 }
1262 1262
1263 kfree (instance); 1263 kfree(instance);
1264 1264
1265 return error; 1265 return error;
1266} 1266}