Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master

1 files changed, 10 insertions, 10 deletions

diff --git a/drivers/net/irda/via-ircc.c b/drivers/net/irda/via-ircc.c
index a5ca71cec028..b0a6cd815be1 100644
--- a/drivers/net/irda/via-ircc.c
+++ b/drivers/net/irda/via-ircc.c
@@ -45,11 +45,11 @@ F02 Oct/28/02: Add SB device ID for 3147 and 3177.
 #include <linux/netdevice.h>
 #include <linux/ioport.h>
 #include <linux/delay.h>
-#include <linux/slab.h>
 #include <linux/init.h>
 #include <linux/rtnetlink.h>
 #include <linux/pci.h>
 #include <linux/dma-mapping.h>
+#include <linux/gfp.h>
 
 #include <asm/io.h>
 #include <asm/dma.h>
@@ -121,7 +121,7 @@ static void iodelay(int udelay)
         }
 }
 
-static struct pci_device_id via_pci_tbl[] = {
+static DEFINE_PCI_DEVICE_TABLE(via_pci_tbl) = {
         { PCI_VENDOR_ID_VIA, 0x8231, PCI_ANY_ID, PCI_ANY_ID,0,0,0 },
         { PCI_VENDOR_ID_VIA, 0x3109, PCI_ANY_ID, PCI_ANY_ID,0,0,1 },
         { PCI_VENDOR_ID_VIA, 0x3074, PCI_ANY_ID, PCI_ANY_ID,0,0,2 },
@@ -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);