vserver 2.0 rc7

[linux-2.6.git] / drivers / isdn / hisax / hisax_fcpcipnp.c

diff --git a/drivers/isdn/hisax/hisax_fcpcipnp.c b/drivers/isdn/hisax/hisax_fcpcipnp.c
index 98c408e..b4d795d 100644 (file)
--- a/drivers/isdn/hisax/hisax_fcpcipnp.c
+++ b/drivers/isdn/hisax/hisax_fcpcipnp.c
@@ -45,8 +45,8 @@
 #ifdef CONFIG_HISAX_DEBUG
 static int debug = 0;
 /* static int hdlcfifosize = 32; */
-MODULE_PARM(debug, "i");
-/* MODULE_PARM(hdlcfifosize, "i"); */
+module_param(debug, int, 0);
+/* module_param(hdlcfifosize, int, 0); */
 #endif
 
 MODULE_AUTHOR("Kai Germaschewski <kai.germaschewski@gmx.de>/Karsten Keil <kkeil@suse.de>");
@@ -81,7 +81,7 @@ MODULE_DEVICE_TABLE(isapnp, fcpnp_ids);
 #endif
 
 static int protocol = 2;       /* EURO-ISDN Default */
-MODULE_PARM(protocol, "i");
+module_param(protocol, int, 0);
 MODULE_LICENSE("GPL");
 
 // ----------------------------------------------------------------------
@@ -902,7 +902,7 @@ static int __devinit fcpci_probe(struct pci_dev *pdev,
        adapter->irq = pdev->irq;
 
        printk(KERN_INFO "hisax_fcpcipnp: found adapter %s at %s\n",
-              (char *) ent->driver_data, pdev->slot_name);
+              (char *) ent->driver_data, pci_name(pdev));
 
        retval = fcpcipnp_setup(adapter);
        if (retval)
@@ -996,36 +996,20 @@ static struct pci_driver fcpci_driver = {
 
 static int __init hisax_fcpcipnp_init(void)
 {
-       int retval, pci_nr_found;
+       int retval;
 
        printk(KERN_INFO "hisax_fcpcipnp: Fritz!Card PCI/PCIv2/PnP ISDN driver v0.0.1\n");
 
        retval = pci_register_driver(&fcpci_driver);
-       if (retval < 0)
+       if (retval)
                goto out;
-       pci_nr_found = retval;
-       retval = 0;
-
 #ifdef __ISAPNP__
        retval = pnp_register_driver(&fcpnp_driver);
        if (retval < 0)
                goto out_unregister_pci;
 #endif
-
-#if !defined(CONFIG_HOTPLUG) || defined(MODULE)
-       if (pci_nr_found + retval == 0) {
-               retval = -ENODEV;
-               goto out_unregister_isapnp;
-       }
-#endif
        return 0;
 
-#if !defined(CONFIG_HOTPLUG) || defined(MODULE)
- out_unregister_isapnp:
-#ifdef __ISAPNP__
-       pnp_unregister_driver(&fcpnp_driver);
-#endif
-#endif
  out_unregister_pci:
        pci_unregister_driver(&fcpci_driver);
  out: