linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / drivers / net / wan / wanxl.c

diff --git a/drivers/net/wan/wanxl.c b/drivers/net/wan/wanxl.c
index b2031df..9d3b51c 100644 (file)
--- a/drivers/net/wan/wanxl.c
+++ b/drivers/net/wan/wanxl.c
@@ -149,10 +149,7 @@ static inline void wanxl_cable_intr(port_t *port)
        printk(KERN_INFO "%s: %s%s module, %s cable%s%s\n",
               port->dev->name, pm, dte, cable, dsr, dcd);
 
-       if (value & STATUS_CABLE_DCD)
-               netif_carrier_on(port->dev);
-       else
-               netif_carrier_off(port->dev);
+       hdlc_set_carrier(value & STATUS_CABLE_DCD, port->dev);
 }
 
 
@@ -580,8 +577,8 @@ static int __devinit wanxl_pci_init_one(struct pci_dev *pdev,
           We set both dma_mask and consistent_dma_mask to 28 bits
           and pray pci_alloc_consistent() will use this info. It should
           work on most platforms */
-       if (pci_set_consistent_dma_mask(pdev, DMA_28BIT_MASK) ||
-           pci_set_dma_mask(pdev, DMA_28BIT_MASK)) {
+       if (pci_set_consistent_dma_mask(pdev, 0x0FFFFFFF) ||
+           pci_set_dma_mask(pdev, 0x0FFFFFFF)) {
                printk(KERN_ERR "wanXL: No usable DMA configuration\n");
                return -EIO;
        }
@@ -637,13 +634,7 @@ static int __devinit wanxl_pci_init_one(struct pci_dev *pdev,
 
        /* set up PLX mapping */
        plx_phy = pci_resource_start(pdev, 0);
-
        card->plx = ioremap_nocache(plx_phy, 0x70);
-       if (!card->plx) {
-               printk(KERN_ERR "wanxl: ioremap() failed\n");
-               wanxl_pci_remove_one(pdev);
-               return -EFAULT;
-       }
 
 #if RESET_WHILE_LOADING
        wanxl_reset(card);
@@ -709,12 +700,6 @@ static int __devinit wanxl_pci_init_one(struct pci_dev *pdev,
        }
 
        mem = ioremap_nocache(mem_phy, PDM_OFFSET + sizeof(firmware));
-       if (!mem) {
-               printk(KERN_ERR "wanxl: ioremap() failed\n");
-               wanxl_pci_remove_one(pdev);
-               return -EFAULT;
-       }
-
        for (i = 0; i < sizeof(firmware); i += 4)
                writel(htonl(*(u32*)(firmware + i)), mem + PDM_OFFSET + i);
 
@@ -758,7 +743,7 @@ static int __devinit wanxl_pci_init_one(struct pci_dev *pdev,
               pci_name(pdev), plx_phy, ramsize / 1024, mem_phy, pdev->irq);
 
        /* Allocate IRQ */
-       if (request_irq(pdev->irq, wanxl_intr, IRQF_SHARED, "wanXL", card)) {
+       if (request_irq(pdev->irq, wanxl_intr, SA_SHIRQ, "wanXL", card)) {
                printk(KERN_WARNING "wanXL %s: could not allocate IRQ%i.\n",
                       pci_name(pdev), pdev->irq);
                wanxl_pci_remove_one(pdev);