patch-2_6_7-vs1_9_1_12

[linux-2.6.git] / drivers / pci / hotplug / cpcihp_generic.c

diff --git a/drivers/pci/hotplug/cpcihp_generic.c b/drivers/pci/hotplug/cpcihp_generic.c
index aaabd41..141941a 100644 (file)
--- a/drivers/pci/hotplug/cpcihp_generic.c
+++ b/drivers/pci/hotplug/cpcihp_generic.c
@@ -76,73 +76,6 @@ static u8 enum_mask;
 static struct cpci_hp_controller_ops generic_hpc_ops;
 static struct cpci_hp_controller generic_hpc;
 
-/* The following allows configuring the driver when it's compiled into the kernel */
-#ifndef MODULE
-static int __init cpcihp_generic_setup(char* str)
-{
-       char* p;
-       unsigned long tmp;
-
-       if(!str)
-               return -EINVAL;
-       bridge = str;
-
-       p = strchr(str, ',');
-       str = p + 1;
-       if(!(p && *str && *p == ','))
-               goto setup_error;
-       tmp = simple_strtoul(str, &p, 0);
-       if(p == str || tmp > 0xff) {
-               err("hotplug bus first slot number out of range");
-               goto setup_error;
-       }
-       first_slot = (u8) tmp;
-
-       str = p + 1;            
-       if(!(*str && *p == ','))
-               return -EINVAL;
-       tmp = simple_strtoul(str, &p, 0);
-       if(p == str || tmp > 0xff) {
-               err("hotplug bus last slot number out of range");
-               goto setup_error;
-       }
-       last_slot = (u8) tmp;
-
-       str = p + 1;
-       if(!(*str && *p == ','))
-               goto setup_error;
-       tmp = simple_strtoul(str, &p, 0);
-       if(p == str || tmp > 0xffff) {
-               err("port number out of range");
-               goto setup_error;
-       }
-       port = (u16) tmp;
-
-       str = p + 1;
-       if(!(*str && *p == ','))
-               goto setup_error;
-       tmp = simple_strtoul(str, &p, 0);
-       if(p == str) {
-               err("invalid #ENUM bit number");
-               goto setup_error;
-       }
-       enum_bit = (u8) tmp;
-
-       str = p + 1;
-       if(*str && *p == ',') {
-               tmp = simple_strtoul(str, &p, 0);
-               if(p != str)
-                       debug = (int) tmp;
-       }
-       return 0;
-setup_error:
-       bridge = NULL;
-       return -EINVAL;
-}
-
-__setup("cpcihp_generic=", cpcihp_generic_setup);
-#endif
-
 static int __init validate_parameters(void)
 {
        char* str;