linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / drivers / net / tokenring / abyss.c

diff --git a/drivers/net/tokenring/abyss.c b/drivers/net/tokenring/abyss.c
index 471c6a8..9345e68 100644 (file)
--- a/drivers/net/tokenring/abyss.c
+++ b/drivers/net/tokenring/abyss.c
@@ -139,7 +139,7 @@ static int __devinit abyss_attach(struct pci_dev *pdev, const struct pci_device_
         */
        dev->base_addr += 0x10;
                
-       ret = tmsdev_init(dev, PCI_MAX_ADDRESS, pdev);
+       ret = tmsdev_init(dev, &pdev->dev);
        if (ret) {
                printk("%s: unable to get memory for dev->priv.\n", 
                       dev->name);
@@ -457,14 +457,7 @@ static struct pci_driver abyss_driver = {
 
 static int __init abyss_init (void)
 {
-       int rc = pci_register_driver (&abyss_driver);
-       if (rc < 0)
-               return rc;
-       if (rc == 0) {
-               pci_unregister_driver (&abyss_driver);
-               return -ENODEV;
-       }
-       return 0;
+       return pci_register_driver(&abyss_driver);
 }
 
 static void __exit abyss_rmmod (void)
@@ -475,14 +468,3 @@ static void __exit abyss_rmmod (void)
 module_init(abyss_init);
 module_exit(abyss_rmmod);
 
-\f
-/*
- * Local variables:
- *  compile-command: "gcc -DMODVERSIONS  -DMODULE -D__KERNEL__ -Wall -Wstrict-prototypes -O6 -fomit-frame-pointer -I/usr/src/linux/drivers/net/tokenring/ -c abyss.c"
- *  alt-compile-command: "gcc -DMODULE -D__KERNEL__ -Wall -Wstrict-prototypes -O6 -fomit-frame-pointer -I/usr/src/linux/drivers/net/tokenring/ -c abyss.c"
- *  c-set-style "K&R"
- *  c-indent-level: 8
- *  c-basic-offset: 8
- *  tab-width: 8
- * End:
- */