Merge branch 'linus' into x86/urgent

[pandora-kernel.git] / drivers / net / jazzsonic.c

diff --git a/drivers/net/jazzsonic.c b/drivers/net/jazzsonic.c
index 2f28609..f47d4d6 100644 (file)
--- a/drivers/net/jazzsonic.c
+++ b/drivers/net/jazzsonic.c
@@ -81,7 +81,7 @@ static unsigned short known_revisions[] =
 
 static int jazzsonic_open(struct net_device* dev)
 {
-       if (request_irq(dev->irq, &sonic_interrupt, IRQF_DISABLED, "sonic", dev)) {
+       if (request_irq(dev->irq, sonic_interrupt, IRQF_DISABLED, "sonic", dev)) {
                printk(KERN_ERR "%s: unable to get IRQ %d.\n", dev->name, dev->irq);
                return -EAGAIN;
        }
@@ -108,7 +108,7 @@ static const struct net_device_ops sonic_netdev_ops = {
        .ndo_set_mac_address    = eth_mac_addr,
 };
 
-static int __init sonic_probe1(struct net_device *dev)
+static int __devinit sonic_probe1(struct net_device *dev)
 {
        static unsigned version_printed;
        unsigned int silicon_revision;
@@ -130,8 +130,8 @@ static int __init sonic_probe1(struct net_device *dev)
                printk("SONIC Silicon Revision = 0x%04x\n",silicon_revision);
 
        i = 0;
-       while (known_revisions[i] != 0xffff
-              && known_revisions[i] != silicon_revision)
+       while (known_revisions[i] != 0xffff &&
+              known_revisions[i] != silicon_revision)
                i++;
 
        if (known_revisions[i] == 0xffff) {
@@ -203,7 +203,7 @@ static int __init sonic_probe1(struct net_device *dev)
 
        return 0;
 out:
-       release_region(dev->base_addr, SONIC_MEM_SIZE);
+       release_mem_region(dev->base_addr, SONIC_MEM_SIZE);
        return err;
 }
 
@@ -211,7 +211,7 @@ out:
  * Probe for a SONIC ethernet controller on a Mips Jazz board.
  * Actually probing is superfluous but we're paranoid.
  */
-static int __init jazz_sonic_probe(struct platform_device *pdev)
+static int __devinit jazz_sonic_probe(struct platform_device *pdev)
 {
        struct net_device *dev;
        struct sonic_local *lp;
@@ -247,7 +247,7 @@ static int __init jazz_sonic_probe(struct platform_device *pdev)
        return 0;
 
 out1:
-       release_region(dev->base_addr, SONIC_MEM_SIZE);
+       release_mem_region(dev->base_addr, SONIC_MEM_SIZE);
 out:
        free_netdev(dev);
 
@@ -269,7 +269,7 @@ static int __devexit jazz_sonic_device_remove (struct platform_device *pdev)
        unregister_netdev(dev);
        dma_free_coherent(lp->device, SIZEOF_SONIC_DESC * SONIC_BUS_SCALE(lp->dma_bitmode),
                          lp->descriptors, lp->descriptors_laddr);
-       release_region (dev->base_addr, SONIC_MEM_SIZE);
+       release_mem_region(dev->base_addr, SONIC_MEM_SIZE);
        free_netdev(dev);
 
        return 0;