10 files changed, 80 insertions, 80 deletions

diff --git a/drivers/net/usb/asix.c b/drivers/net/usb/asix.c
index 1bef39a60a62..a516185cbc9f 100644
--- a/drivers/net/usb/asix.c
+++ b/drivers/net/usb/asix.c
@@ -365,8 +365,8 @@ static struct sk_buff *asix_tx_fixup(struct usbnet *dev, struct sk_buff *skb,
 
         padlen = ((skb->len + 4) % 512) ? 0 : 4;
 
-        if ((!skb_cloned(skb))
-            && ((headroom + tailroom) >= (4 + padlen))) {
+        if ((!skb_cloned(skb)) &&
+            ((headroom + tailroom) >= (4 + padlen))) {
                 if ((headroom < 4) || (tailroom < padlen)) {
                         skb->data = memmove(skb->head + 4, skb->data, skb->len);
                         skb_set_tail_pointer(skb, skb->len);
@@ -541,8 +541,8 @@ static void asix_set_multicast(struct net_device *net)
 
         if (net->flags & IFF_PROMISC) {
                 rx_ctl |= AX_RX_CTL_PRO;
-        } else if (net->flags & IFF_ALLMULTI
-                   || net->mc_count > AX_MAX_MCAST) {
+        } else if (net->flags & IFF_ALLMULTI ||
+                   net->mc_count > AX_MAX_MCAST) {
                 rx_ctl |= AX_RX_CTL_AMALL;
         } else if (net->mc_count == 0) {
                 /* just broadcast and directed */
@@ -753,8 +753,8 @@ static void ax88172_set_multicast(struct net_device *net)
 
         if (net->flags & IFF_PROMISC) {
                 rx_ctl |= 0x01;
-        } else if (net->flags & IFF_ALLMULTI
-                   || net->mc_count > AX_MAX_MCAST) {
+        } else if (net->flags & IFF_ALLMULTI ||
+                   net->mc_count > AX_MAX_MCAST) {
                 rx_ctl |= 0x02;
         } else if (net->mc_count == 0) {
                 /* just broadcast and directed */
diff --git a/drivers/net/usb/catc.c b/drivers/net/usb/catc.c
index 2bed6b087d16..22b87e64a810 100644
--- a/drivers/net/usb/catc.c
+++ b/drivers/net/usb/catc.c
@@ -436,8 +436,8 @@ static netdev_tx_t catc_start_xmit(struct sk_buff *skb,
                         clear_bit(TX_RUNNING, &catc->flags);
         }
 
-        if ((catc->is_f5u011 && catc->tx_ptr)
-             || (catc->tx_ptr >= ((TX_MAX_BURST - 1) * (PKT_SZ + 2))))
+        if ((catc->is_f5u011 && catc->tx_ptr) ||
+            (catc->tx_ptr >= ((TX_MAX_BURST - 1) * (PKT_SZ + 2))))
                 netif_stop_queue(netdev);
 
         spin_unlock_irqrestore(&catc->tx_lock, flags);
diff --git a/drivers/net/usb/cdc-phonet.c b/drivers/net/usb/cdc-phonet.c
index 33d5c579c5ad..6491c9c00c83 100644
--- a/drivers/net/usb/cdc-phonet.c
+++ b/drivers/net/usb/cdc-phonet.c
@@ -372,12 +372,12 @@ int usbpn_probe(struct usb_interface *intf, const struct usb_device_id *id)
         /* Data interface has one inactive and one active setting */
         if (data_intf->num_altsetting != 2)
                 return -EINVAL;
-        if (data_intf->altsetting[0].desc.bNumEndpoints == 0
-         && data_intf->altsetting[1].desc.bNumEndpoints == 2)
+        if (data_intf->altsetting[0].desc.bNumEndpoints == 0 &&
+            data_intf->altsetting[1].desc.bNumEndpoints == 2)
                 data_desc = data_intf->altsetting + 1;
         else
-        if (data_intf->altsetting[0].desc.bNumEndpoints == 2
-         && data_intf->altsetting[1].desc.bNumEndpoints == 0)
+        if (data_intf->altsetting[0].desc.bNumEndpoints == 2 &&
+            data_intf->altsetting[1].desc.bNumEndpoints == 0)
                 data_desc = data_intf->altsetting;
         else
                 return -EINVAL;
diff --git a/drivers/net/usb/cdc_eem.c b/drivers/net/usb/cdc_eem.c
index 23300656c266..c337ffc3304a 100644
--- a/drivers/net/usb/cdc_eem.c
+++ b/drivers/net/usb/cdc_eem.c
@@ -121,8 +121,8 @@ static struct sk_buff *eem_tx_fixup(struct usbnet *dev, struct sk_buff *skb,
                 int     headroom = skb_headroom(skb);
                 int     tailroom = skb_tailroom(skb);
 
-                if ((tailroom >= ETH_FCS_LEN + padlen)
-                                && (headroom >= EEM_HEAD))
+                if ((tailroom >= ETH_FCS_LEN + padlen) &&
+                    (headroom >= EEM_HEAD))
                         goto done;
 
                 if ((headroom + tailroom)
diff --git a/drivers/net/usb/cdc_ether.c b/drivers/net/usb/cdc_ether.c
index 7ec24c9b2535..de3e36596779 100644
--- a/drivers/net/usb/cdc_ether.c
+++ b/drivers/net/usb/cdc_ether.c
@@ -37,23 +37,23 @@
 
 static int is_rndis(struct usb_interface_descriptor *desc)
 {
-        return desc->bInterfaceClass == USB_CLASS_COMM
-                && desc->bInterfaceSubClass == 2
-                && desc->bInterfaceProtocol == 0xff;
+        return (desc->bInterfaceClass == USB_CLASS_COMM &&
+                desc->bInterfaceSubClass == 2 &&
+                desc->bInterfaceProtocol == 0xff);
 }
 
 static int is_activesync(struct usb_interface_descriptor *desc)
 {
-        return desc->bInterfaceClass == USB_CLASS_MISC
-                && desc->bInterfaceSubClass == 1
-                && desc->bInterfaceProtocol == 1;
+        return (desc->bInterfaceClass == USB_CLASS_MISC &&
+                desc->bInterfaceSubClass == 1 &&
+                desc->bInterfaceProtocol == 1);
 }
 
 static int is_wireless_rndis(struct usb_interface_descriptor *desc)
 {
-        return desc->bInterfaceClass == USB_CLASS_WIRELESS_CONTROLLER
-                && desc->bInterfaceSubClass == 1
-                && desc->bInterfaceProtocol == 3;
+        return (desc->bInterfaceClass == USB_CLASS_WIRELESS_CONTROLLER &&
+                desc->bInterfaceSubClass == 1 &&
+                desc->bInterfaceProtocol == 3);
 }
 
 #else
@@ -116,9 +116,9 @@ int usbnet_generic_cdc_bind(struct usbnet *dev, struct usb_interface *intf)
         /* this assumes that if there's a non-RNDIS vendor variant
          * of cdc-acm, it'll fail RNDIS requests cleanly.
          */
-        rndis = is_rndis(&intf->cur_altsetting->desc)
-                || is_activesync(&intf->cur_altsetting->desc)
-                || is_wireless_rndis(&intf->cur_altsetting->desc);
+        rndis = (is_rndis(&intf->cur_altsetting->desc) ||
+                 is_activesync(&intf->cur_altsetting->desc) ||
+                 is_wireless_rndis(&intf->cur_altsetting->desc));
 
         memset(info, 0, sizeof *info);
         info->control = intf;
@@ -279,10 +279,10 @@ next_desc:
 
                 dev->status = &info->control->cur_altsetting->endpoint [0];
                 desc = &dev->status->desc;
-                if (!usb_endpoint_is_int_in(desc)
-                                || (le16_to_cpu(desc->wMaxPacketSize)
-                                        < sizeof(struct usb_cdc_notification))
-                                || !desc->bInterval) {
+                if (!usb_endpoint_is_int_in(desc) ||
+                    (le16_to_cpu(desc->wMaxPacketSize)
+                     < sizeof(struct usb_cdc_notification)) ||
+                    !desc->bInterval) {
                         dev_dbg(&intf->dev, "bad notification endpoint\n");
                         dev->status = NULL;
                 }
diff --git a/drivers/net/usb/hso.c b/drivers/net/usb/hso.c
index 43bc3fcc0d85..f78f0903b073 100644
--- a/drivers/net/usb/hso.c
+++ b/drivers/net/usb/hso.c
@@ -602,9 +602,9 @@ static struct hso_serial *get_serial_by_shared_int_and_type(
         port = hso_mux_to_port(mux);
 
         for (i = 0; i < HSO_SERIAL_TTY_MINORS; i++) {
-                if (serial_table[i]
-                    && (dev2ser(serial_table[i])->shared_int == shared_int)
-                    && ((serial_table[i]->port_spec & HSO_PORT_MASK) == port)) {
+                if (serial_table[i] &&
+                    (dev2ser(serial_table[i])->shared_int == shared_int) &&
+                    ((serial_table[i]->port_spec & HSO_PORT_MASK) == port)) {
                         return dev2ser(serial_table[i]);
                 }
         }
@@ -846,8 +846,8 @@ static void hso_net_tx_timeout(struct net_device *net)
         dev_warn(&net->dev, "Tx timed out.\n");
 
         /* Tear the waiting frame off the list */
-        if (odev->mux_bulk_tx_urb
-            && (odev->mux_bulk_tx_urb->status == -EINPROGRESS))
+        if (odev->mux_bulk_tx_urb &&
+            (odev->mux_bulk_tx_urb->status == -EINPROGRESS))
                 usb_unlink_urb(odev->mux_bulk_tx_urb);
 
         /* Update statistics */
@@ -1020,9 +1020,9 @@ static void read_bulk_callback(struct urb *urb)
                 u32 rest;
                 u8 crc_check[4] = { 0xDE, 0xAD, 0xBE, 0xEF };
                 rest = urb->actual_length % odev->in_endp->wMaxPacketSize;
-                if (((rest == 5) || (rest == 6))
-                    && !memcmp(((u8 *) urb->transfer_buffer) +
-                               urb->actual_length - 4, crc_check, 4)) {
+                if (((rest == 5) || (rest == 6)) &&
+                    !memcmp(((u8 *) urb->transfer_buffer) +
+                            urb->actual_length - 4, crc_check, 4)) {
                         urb->actual_length -= 4;
                 }
         }
@@ -1226,9 +1226,9 @@ static void hso_std_serial_read_bulk_callback(struct urb *urb)
                         rest =
                             urb->actual_length %
                             serial->in_endp->wMaxPacketSize;
-                        if (((rest == 5) || (rest == 6))
-                            && !memcmp(((u8 *) urb->transfer_buffer) +
-                                       urb->actual_length - 4, crc_check, 4)) {
+                        if (((rest == 5) || (rest == 6)) &&
+                            !memcmp(((u8 *) urb->transfer_buffer) +
+                                    urb->actual_length - 4, crc_check, 4)) {
                                 urb->actual_length -= 4;
                         }
                 }
@@ -2982,8 +2982,8 @@ static int hso_probe(struct usb_interface *interface,
 
         case HSO_INTF_BULK:
                 /* It's a regular bulk interface */
-                if (((port_spec & HSO_PORT_MASK) == HSO_PORT_NETWORK)
-                    && !disable_net)
+                if (((port_spec & HSO_PORT_MASK) == HSO_PORT_NETWORK) &&
+                    !disable_net)
                         hso_dev = hso_create_net_device(interface, port_spec);
                 else
                         hso_dev =
@@ -3146,8 +3146,8 @@ static void hso_free_interface(struct usb_interface *interface)
         int i;
 
         for (i = 0; i < HSO_SERIAL_TTY_MINORS; i++) {
-                if (serial_table[i]
-                    && (serial_table[i]->interface == interface)) {
+                if (serial_table[i] &&
+                    (serial_table[i]->interface == interface)) {
                         hso_dev = dev2ser(serial_table[i]);
                         spin_lock_irq(&hso_dev->serial_lock);
                         tty = tty_kref_get(hso_dev->tty);
@@ -3163,8 +3163,8 @@ static void hso_free_interface(struct usb_interface *interface)
         }
 
         for (i = 0; i < HSO_MAX_NET_DEVICES; i++) {
-                if (network_table[i]
-                    && (network_table[i]->interface == interface)) {
+                if (network_table[i] &&
+                    (network_table[i]->interface == interface)) {
                         struct rfkill *rfk = dev2net(network_table[i])->rfkill;
                         /* hso_stop_net_device doesn't stop the net queue since
                          * traffic needs to start it again when suspended */
diff --git a/drivers/net/usb/mcs7830.c b/drivers/net/usb/mcs7830.c
index 10873d96b2da..87374317f480 100644
--- a/drivers/net/usb/mcs7830.c
+++ b/drivers/net/usb/mcs7830.c
@@ -391,8 +391,8 @@ static void mcs7830_set_multicast(struct net_device *net)
 
         if (net->flags & IFF_PROMISC) {
                 data->config |= HIF_REG_CONFIG_PROMISCIOUS;
-        } else if (net->flags & IFF_ALLMULTI
-                   || net->mc_count > MCS7830_MAX_MCAST) {
+        } else if (net->flags & IFF_ALLMULTI ||
+                   net->mc_count > MCS7830_MAX_MCAST) {
                 data->config |= HIF_REG_CONFIG_ALLMULTICAST;
         } else if (net->mc_count == 0) {
                 /* just broadcast and directed */
diff --git a/drivers/net/usb/rndis_host.c b/drivers/net/usb/rndis_host.c
index f56dec6119c3..490fa8f55424 100644
--- a/drivers/net/usb/rndis_host.c
+++ b/drivers/net/usb/rndis_host.c
@@ -114,8 +114,8 @@ int rndis_command(struct usbnet *dev, struct rndis_msg_hdr *buf, int buflen)
          */
 
         /* Issue the request; xid is unique, don't bother byteswapping it */
-        if (likely(buf->msg_type != RNDIS_MSG_HALT
-                        && buf->msg_type != RNDIS_MSG_RESET)) {
+        if (likely(buf->msg_type != RNDIS_MSG_HALT &&
+                   buf->msg_type != RNDIS_MSG_RESET)) {
                 xid = dev->xid++;
                 if (!xid)
                         xid = dev->xid++;
@@ -493,9 +493,9 @@ int rndis_rx_fixup(struct usbnet *dev, struct sk_buff *skb)
                 data_len = le32_to_cpu(hdr->data_len);
 
                 /* don't choke if we see oob, per-packet data, etc */
-                if (unlikely(hdr->msg_type != RNDIS_MSG_PACKET
-                                || skb->len < msg_len
-                                || (data_offset + data_len + 8) > msg_len)) {
+                if (unlikely(hdr->msg_type != RNDIS_MSG_PACKET ||
+                             skb->len < msg_len ||
+                             (data_offset + data_len + 8) > msg_len)) {
                         dev->net->stats.rx_frame_errors++;
                         devdbg(dev, "bad rndis message %d/%d/%d/%d, len %d",
                                 le32_to_cpu(hdr->msg_type),
diff --git a/drivers/net/usb/usbnet.c b/drivers/net/usb/usbnet.c
index 04f3f289e87c..511e7bdc4573 100644
--- a/drivers/net/usb/usbnet.c
+++ b/drivers/net/usb/usbnet.c
@@ -140,8 +140,8 @@ int usbnet_get_endpoints(struct usbnet *dev, struct usb_interface *intf)
         if (!alt || !in || !out)
                 return -EINVAL;
 
-        if (alt->desc.bAlternateSetting != 0
-                        || !(dev->driver_info->flags & FLAG_NO_SETINT)) {
+        if (alt->desc.bAlternateSetting != 0 ||
+            !(dev->driver_info->flags & FLAG_NO_SETINT)) {
                 tmp = usb_set_interface (dev->udev, alt->desc.bInterfaceNumber,
                                 alt->desc.bAlternateSetting);
                 if (tmp < 0)
@@ -351,9 +351,9 @@ static void rx_submit (struct usbnet *dev, struct urb *urb, gfp_t flags)
 
         spin_lock_irqsave (&dev->rxq.lock, lockflags);
 
-        if (netif_running (dev->net)
-                        && netif_device_present (dev->net)
-                        && !test_bit (EVENT_RX_HALT, &dev->flags)) {
+        if (netif_running (dev->net) &&
+            netif_device_present (dev->net) &&
+            !test_bit (EVENT_RX_HALT, &dev->flags)) {
                 switch (retval = usb_submit_urb (urb, GFP_ATOMIC)) {
                 case -EPIPE:
                         usbnet_defer_kevent (dev, EVENT_RX_HALT);
@@ -391,8 +391,8 @@ static void rx_submit (struct usbnet *dev, struct urb *urb, gfp_t flags)
 
 static inline void rx_process (struct usbnet *dev, struct sk_buff *skb)
 {
-        if (dev->driver_info->rx_fixup
-                        && !dev->driver_info->rx_fixup (dev, skb))
+        if (dev->driver_info->rx_fixup &&
+            !dev->driver_info->rx_fixup (dev, skb))
                 goto error;
         // else network stack removes extra byte if we forced a short packet
 
@@ -484,8 +484,8 @@ block:
         defer_bh(dev, skb, &dev->rxq);
 
         if (urb) {
-                if (netif_running (dev->net)
-                                && !test_bit (EVENT_RX_HALT, &dev->flags)) {
+                if (netif_running (dev->net) &&
+                    !test_bit (EVENT_RX_HALT, &dev->flags)) {
                         rx_submit (dev, urb, GFP_ATOMIC);
                         return;
                 }
@@ -649,9 +649,9 @@ int usbnet_stop (struct net_device *net)
                         unlink_urbs(dev, &dev->rxq);
 
                 /* maybe wait for deletions to finish. */
-                while (!skb_queue_empty(&dev->rxq)
-                                && !skb_queue_empty(&dev->txq)
-                                && !skb_queue_empty(&dev->done)) {
+                while (!skb_queue_empty(&dev->rxq) &&
+                       !skb_queue_empty(&dev->txq) &&
+                       !skb_queue_empty(&dev->done)) {
                         msleep(UNLINK_TIMEOUT_MS);
                         if (netif_msg_ifdown(dev))
                                 devdbg(dev, "waited for %d urb completions",
@@ -882,9 +882,9 @@ kevent (struct work_struct *work)
         if (test_bit (EVENT_TX_HALT, &dev->flags)) {
                 unlink_urbs (dev, &dev->txq);
                 status = usb_clear_halt (dev->udev, dev->out);
-                if (status < 0
-                                && status != -EPIPE
-                                && status != -ESHUTDOWN) {
+                if (status < 0 &&
+                    status != -EPIPE &&
+                    status != -ESHUTDOWN) {
                         if (netif_msg_tx_err (dev))
                                 deverr (dev, "can't clear tx halt, status %d",
                                         status);
@@ -897,9 +897,9 @@ kevent (struct work_struct *work)
         if (test_bit (EVENT_RX_HALT, &dev->flags)) {
                 unlink_urbs (dev, &dev->rxq);
                 status = usb_clear_halt (dev->udev, dev->in);
-                if (status < 0
-                                && status != -EPIPE
-                                && status != -ESHUTDOWN) {
+                if (status < 0 &&
+                    status != -EPIPE &&
+                    status != -ESHUTDOWN) {
                         if (netif_msg_rx_err (dev))
                                 deverr (dev, "can't clear rx halt, status %d",
                                         status);
@@ -1126,10 +1126,10 @@ static void usbnet_bh (unsigned long param)
                 }
 
         // or are we maybe short a few urbs?
-        } else if (netif_running (dev->net)
-                        && netif_device_present (dev->net)
-                        && !timer_pending (&dev->delay)
-                        && !test_bit (EVENT_RX_HALT, &dev->flags)) {
+        } else if (netif_running (dev->net) &&
+                   netif_device_present (dev->net) &&
+                   !timer_pending (&dev->delay) &&
+                   !test_bit (EVENT_RX_HALT, &dev->flags)) {
                 int     temp = dev->rxq.qlen;
                 int     qlen = RX_QLEN (dev);
 
@@ -1297,8 +1297,8 @@ usbnet_probe (struct usb_interface *udev, const struct usb_device_id *prod)
                 // heuristic:  "usb%d" for links we know are two-host,
                 // else "eth%d" when there's reasonable doubt.  userspace
                 // can rename the link if it knows better.
-                if ((dev->driver_info->flags & FLAG_ETHER) != 0
-                                && (net->dev_addr [0] & 0x02) == 0)
+                if ((dev->driver_info->flags & FLAG_ETHER) != 0 &&
+                    (net->dev_addr [0] & 0x02) == 0)
                         strcpy (net->name, "eth%d");
                 /* WLAN devices should always be named "wlan%d" */
                 if ((dev->driver_info->flags & FLAG_WLAN) != 0)
diff --git a/drivers/net/usb/zaurus.c b/drivers/net/usb/zaurus.c
index 04882c8f9bf1..3eb0b167b5b4 100644
--- a/drivers/net/usb/zaurus.c
+++ b/drivers/net/usb/zaurus.c
@@ -174,8 +174,8 @@ static int blan_mdlm_bind(struct usbnet *dev, struct usb_interface *intf)
                                 goto bad_desc;
                         }
                         /* expect bcdVersion 1.0, ignore */
-                        if (memcmp(&desc->bGUID, blan_guid, 16)
-                                    && memcmp(&desc->bGUID, safe_guid, 16) ) {
+                        if (memcmp(&desc->bGUID, blan_guid, 16) &&
+                            memcmp(&desc->bGUID, safe_guid, 16)) {
                                 /* hey, this one might _really_ be MDLM! */
                                 dev_dbg(&intf->dev, "MDLM guid\n");
                                 goto bad_desc;