5 files changed, 29 insertions, 29 deletions

diff --git a/drivers/net/irda/au1k_ir.c b/drivers/net/irda/au1k_ir.c
index eb424681202d..9b2eebdbb25b 100644
--- a/drivers/net/irda/au1k_ir.c
+++ b/drivers/net/irda/au1k_ir.c
@@ -353,13 +353,13 @@ static int au1k_irda_start(struct net_device *dev)
                 return retval;
         }
 
-        if ((retval = request_irq(AU1000_IRDA_TX_INT, &au1k_irda_interrupt, 
+        if ((retval = request_irq(AU1000_IRDA_TX_INT, au1k_irda_interrupt, 
                                         0, dev->name, dev))) {
                 printk(KERN_ERR "%s: unable to get IRQ %d\n", 
                                 dev->name, dev->irq);
                 return retval;
         }
-        if ((retval = request_irq(AU1000_IRDA_RX_INT, &au1k_irda_interrupt, 
+        if ((retval = request_irq(AU1000_IRDA_RX_INT, au1k_irda_interrupt, 
                                         0, dev->name, dev))) {
                 free_irq(AU1000_IRDA_TX_INT, dev);
                 printk(KERN_ERR "%s: unable to get IRQ %d\n", 
diff --git a/drivers/net/irda/irda-usb.c b/drivers/net/irda/irda-usb.c
index 215adf6377d0..e8e33bb9d876 100644
--- a/drivers/net/irda/irda-usb.c
+++ b/drivers/net/irda/irda-usb.c
@@ -852,7 +852,7 @@ static void irda_usb_receive(struct urb *urb)
                  * hot unplug of the dongle...
                  * Lowest effective timer is 10ms...
                  * Jean II */
-                self->rx_defer_timer.function = &irda_usb_rx_defer_expired;
+                self->rx_defer_timer.function = irda_usb_rx_defer_expired;
                 self->rx_defer_timer.data = (unsigned long) urb;
                 mod_timer(&self->rx_defer_timer, jiffies + (10 * HZ / 1000));
                 return;
@@ -1124,11 +1124,11 @@ static int stir421x_patch_device(struct irda_usb_cb *self)
                  * The actual image starts after the "STMP" keyword
                  * so forward to the firmware header tag
                  */
-                for (i = 0; (fw->data[i] != STIR421X_PATCH_END_OF_HDR_TAG)
-                             && (i < fw->size); i++) ;
+                for (i = 0; (fw->data[i] != STIR421X_PATCH_END_OF_HDR_TAG) &&
+                             (i < fw->size); i++) ;
                 /* here we check for the out of buffer case */
-                if ((STIR421X_PATCH_END_OF_HDR_TAG == fw->data[i])
-                    && (i < STIR421X_PATCH_CODE_OFFSET)) {
+                if ((STIR421X_PATCH_END_OF_HDR_TAG == fw->data[i]) &&
+                    (i < STIR421X_PATCH_CODE_OFFSET)) {
                         if (!memcmp(fw->data + i + 1, STIR421X_PATCH_STMP_TAG,
                                     sizeof(STIR421X_PATCH_STMP_TAG) - 1)) {
 
diff --git a/drivers/net/irda/stir4200.c b/drivers/net/irda/stir4200.c
index 528767dec9d7..e5698fa30a4f 100644
--- a/drivers/net/irda/stir4200.c
+++ b/drivers/net/irda/stir4200.c
@@ -612,16 +612,16 @@ static int fifo_txwait(struct stir_cb *stir, int space)
                 pr_debug("fifo status 0x%lx count %lu\n", status, count);
 
                 /* is fifo receiving already, or empty */
-                if (!(status & FIFOCTL_DIR)
-                    || (status & FIFOCTL_EMPTY))
+                if (!(status & FIFOCTL_DIR) ||
+                    (status & FIFOCTL_EMPTY))
                         return 0;
 
                 if (signal_pending(current))
                         return -EINTR;
 
                 /* shutting down? */
-                if (!netif_running(stir->netdev)
-                    || !netif_device_present(stir->netdev))
+                if (!netif_running(stir->netdev) ||
+                    !netif_device_present(stir->netdev))
                         return -ESHUTDOWN;
 
                 /* only waiting for some space */
@@ -776,8 +776,8 @@ static int stir_transmit_thread(void *arg)
                 }
 
                 /* nothing to send? start receiving */
-                if (!stir->receiving 
-                    && irda_device_txqueue_empty(dev)) {
+                if (!stir->receiving &&
+                    irda_device_txqueue_empty(dev)) {
                         /* Wait otherwise chip gets confused. */
                         if (fifo_txwait(stir, -1))
                                 break;
diff --git a/drivers/net/irda/via-ircc.c b/drivers/net/irda/via-ircc.c
index a5ca71cec028..fddb4efd5453 100644
--- a/drivers/net/irda/via-ircc.c
+++ b/drivers/net/irda/via-ircc.c
@@ -1185,8 +1185,8 @@ F01_E */
                  * if frame size,data ptr,or skb ptr are wrong ,the get next
                  * entry.
                  */
-                if ((skb == NULL) || (skb->data == NULL)
-                    || (self->rx_buff.data == NULL) || (len < 6)) {
+                if ((skb == NULL) || (skb->data == NULL) ||
+                    (self->rx_buff.data == NULL) || (len < 6)) {
                         self->netdev->stats.rx_dropped++;
                         return TRUE;
                 }
@@ -1284,8 +1284,8 @@ static int RxTimerHandler(struct via_ircc_cb *self, int iobase)
                 self->RetryCount++;
 
         if ((self->RetryCount >= 1) ||
-            ((st_fifo->pending_bytes + 2048) > self->rx_buff.truesize)
-            || (st_fifo->len >= (MAX_RX_WINDOW))) {
+            ((st_fifo->pending_bytes + 2048) > self->rx_buff.truesize) ||
+            (st_fifo->len >= (MAX_RX_WINDOW))) {
                 while (st_fifo->len > 0) {      //upload frame
                         // Put this entry back in fifo 
                         if (st_fifo->head > MAX_RX_WINDOW)
@@ -1300,8 +1300,8 @@ static int RxTimerHandler(struct via_ircc_cb *self, int iobase)
                          * if frame size, data ptr, or skb ptr are wrong,
                          * then get next entry.
                          */
-                        if ((skb == NULL) || (skb->data == NULL)
-                            || (self->rx_buff.data == NULL) || (len < 6)) {
+                        if ((skb == NULL) || (skb->data == NULL) ||
+                            (self->rx_buff.data == NULL) || (len < 6)) {
                                 self->netdev->stats.rx_dropped++;
                                 continue;
                         }
@@ -1332,8 +1332,8 @@ static int RxTimerHandler(struct via_ircc_cb *self, int iobase)
                  * if frame is receive complete at this routine ,then upload
                  * frame.
                  */
-                if ((GetRXStatus(iobase) & 0x10)
-                    && (RxCurCount(iobase, self) != self->RxLastCount)) {
+                if ((GetRXStatus(iobase) & 0x10) &&
+                    (RxCurCount(iobase, self) != self->RxLastCount)) {
                         upload_rxdata(self, iobase);
                         if (irda_device_txqueue_empty(self->netdev))
                                 via_ircc_dma_receive(self);
diff --git a/drivers/net/irda/vlsi_ir.c b/drivers/net/irda/vlsi_ir.c
index 7cfb8b6593c6..bd3c6b5ee76a 100644
--- a/drivers/net/irda/vlsi_ir.c
+++ b/drivers/net/irda/vlsi_ir.c
@@ -431,8 +431,8 @@ static struct vlsi_ring *vlsi_alloc_ring(struct pci_dev *pdev, struct ring_descr
                 memset(rd, 0, sizeof(*rd));
                 rd->hw = hwmap + i;
                 rd->buf = kmalloc(len, GFP_KERNEL|GFP_DMA);
-                if (rd->buf == NULL
-                    ||  !(busaddr = pci_map_single(pdev, rd->buf, len, dir))) {
+                if (rd->buf == NULL ||
+                    !(busaddr = pci_map_single(pdev, rd->buf, len, dir))) {
                         if (rd->buf) {
                                 IRDA_ERROR("%s: failed to create PCI-MAP for %p",
                                            __func__, rd->buf);
@@ -955,8 +955,8 @@ static netdev_tx_t vlsi_hard_start_xmit(struct sk_buff *skb,
                 }
                 for(;;) {
                         do_gettimeofday(&now);
-                        if (now.tv_sec > ready.tv_sec
-                            ||  (now.tv_sec==ready.tv_sec && now.tv_usec>=ready.tv_usec))
+                        if (now.tv_sec > ready.tv_sec ||
+                            (now.tv_sec==ready.tv_sec && now.tv_usec>=ready.tv_usec))
                                 break;
                         udelay(100);
                         /* must not sleep here - called under netif_tx_lock! */
@@ -1594,8 +1594,8 @@ static int vlsi_irda_init(struct net_device *ndev)
          * see include file for details why we need these 2 masks, in this order!
          */
 
-        if (pci_set_dma_mask(pdev,DMA_MASK_USED_BY_HW)
-            || pci_set_dma_mask(pdev,DMA_MASK_MSTRPAGE)) {
+        if (pci_set_dma_mask(pdev,DMA_MASK_USED_BY_HW) ||
+            pci_set_dma_mask(pdev,DMA_MASK_MSTRPAGE)) {
                 IRDA_ERROR("%s: aborting due to PCI BM-DMA address limitations\n", __func__);
                 return -1;
         }
@@ -1641,8 +1641,8 @@ vlsi_irda_probe(struct pci_dev *pdev, const struct pci_device_id *id)
         IRDA_MESSAGE("%s: IrDA PCI controller %s detected\n",
                      drivername, pci_name(pdev));
 
-        if ( !pci_resource_start(pdev,0)
-             || !(pci_resource_flags(pdev,0) & IORESOURCE_IO) ) {
+        if ( !pci_resource_start(pdev,0) ||
+             !(pci_resource_flags(pdev,0) & IORESOURCE_IO) ) {
                 IRDA_ERROR("%s: bar 0 invalid", __func__);
                 goto out_disable;
         }