WAN: remove SCA support from SCA-II drivers

[pandora-kernel.git] / drivers / net / wan / pci200syn.c

diff --git a/drivers/net/wan/pci200syn.c b/drivers/net/wan/pci200syn.c
index ca06a00..c2620be 100644 (file)
--- a/drivers/net/wan/pci200syn.c
+++ b/drivers/net/wan/pci200syn.c
@@ -41,9 +41,6 @@ static const char* devname = "PCI200SYN";
 
 #define PCI200SYN_PLX_SIZE     0x80    /* PLX control window size (128b) */
 #define PCI200SYN_SCA_SIZE     0x400   /* SCA window size (1Kb) */
-#define ALL_PAGES_ALWAYS_MAPPED
-#define NEED_DETECT_RAM
-#define NEED_SCA_MSCI_INTR
 #define MAX_TX_BUFFERS         10
 
 static int pci_clock_freq = 33000000;
@@ -127,7 +124,7 @@ static inline void new_memcpy_toio(char __iomem *dest, char *src, int length)
 #undef memcpy_toio
 #define memcpy_toio new_memcpy_toio
 
-#include "hd6457x.c"
+#include "hd64572.c"
 
 
 static void pci200_set_iface(port_t *port)
@@ -289,7 +286,6 @@ static int __devinit pci200_pci_init_one(struct pci_dev *pdev,
                                         const struct pci_device_id *ent)
 {
        card_t *card;
-       u8 rev_id;
        u32 __iomem *p;
        int i;
        u32 ramsize;
@@ -313,14 +309,13 @@ static int __devinit pci200_pci_init_one(struct pci_dev *pdev,
                return i;
        }
 
-       card = kmalloc(sizeof(card_t), GFP_KERNEL);
+       card = kzalloc(sizeof(card_t), GFP_KERNEL);
        if (card == NULL) {
                printk(KERN_ERR "pci200syn: unable to allocate memory\n");
                pci_release_regions(pdev);
                pci_disable_device(pdev);
                return -ENOBUFS;
        }
-       memset(card, 0, sizeof(card_t));
        pci_set_drvdata(pdev, card);
        card->ports[0].dev = alloc_hdlcdev(&card->ports[0]);
        card->ports[1].dev = alloc_hdlcdev(&card->ports[1]);
@@ -330,7 +325,6 @@ static int __devinit pci200_pci_init_one(struct pci_dev *pdev,
                return -ENOMEM;
        }
 
-       pci_read_config_byte(pdev, PCI_REVISION_ID, &rev_id);
        if (pci_resource_len(pdev, 0) != PCI200SYN_PLX_SIZE ||
            pci_resource_len(pdev, 2) != PCI200SYN_SCA_SIZE ||
            pci_resource_len(pdev, 3) < 16384) {
@@ -346,7 +340,7 @@ static int __devinit pci200_pci_init_one(struct pci_dev *pdev,
        card->scabase = ioremap(scaphys, PCI200SYN_SCA_SIZE);
 
        ramphys = pci_resource_start(pdev,3) & PCI_BASE_ADDRESS_MEM_MASK;
-       card->rambase = ioremap(ramphys, pci_resource_len(pdev,3));
+       card->rambase = pci_ioremap_bar(pdev, 3);
 
        if (card->plxbase == NULL ||
            card->scabase == NULL ||
@@ -418,7 +412,6 @@ static int __devinit pci200_pci_init_one(struct pci_dev *pdev,
                port->phy_node = i;
 
                spin_lock_init(&port->lock);
-               SET_MODULE_OWNER(dev);
                dev->irq = card->irq;
                dev->mem_start = ramphys;
                dev->mem_end = ramphys + ramsize - 1;
@@ -437,7 +430,7 @@ static int __devinit pci200_pci_init_one(struct pci_dev *pdev,
                        pci200_pci_remove_one(pdev);
                        return -ENOBUFS;
                }
-               sca_init_sync_port(port);       /* Set up SCA memory */
+               sca_init_port(port); /* Set up SCA memory */
 
                printk(KERN_INFO "%s: PCI200SYN node %d\n",
                       dev->name, port->phy_node);