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

1 files changed, 9 insertions, 9 deletions

diff --git a/drivers/net/irda/vlsi_ir.c b/drivers/net/irda/vlsi_ir.c
index 7cfb8b6593c6..209d4bcfaced 100644
--- a/drivers/net/irda/vlsi_ir.c
+++ b/drivers/net/irda/vlsi_ir.c
@@ -59,7 +59,7 @@ MODULE_LICENSE("GPL");
 
 static /* const */ char drivername[] = DRIVER_NAME;
 
-static struct pci_device_id vlsi_irda_table [] = {
+static DEFINE_PCI_DEVICE_TABLE(vlsi_irda_table) = {
         {
                 .class =        PCI_CLASS_WIRELESS_IRDA << 8,
                 .class_mask =   PCI_CLASS_SUBCLASS_MASK << 8, 
@@ -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;
         }