diff options
-rw-r--r-- | drivers/pnp/isapnp/core.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/pnp/isapnp/core.c b/drivers/pnp/isapnp/core.c index 32386ce60478..1a0d33a12862 100644 --- a/drivers/pnp/isapnp/core.c +++ b/drivers/pnp/isapnp/core.c | |||
@@ -47,9 +47,6 @@ | |||
47 | #if 0 | 47 | #if 0 |
48 | #define ISAPNP_REGION_OK | 48 | #define ISAPNP_REGION_OK |
49 | #endif | 49 | #endif |
50 | #if 0 | ||
51 | #define ISAPNP_DEBUG | ||
52 | #endif | ||
53 | 50 | ||
54 | int isapnp_disable; /* Disable ISA PnP */ | 51 | int isapnp_disable; /* Disable ISA PnP */ |
55 | static int isapnp_rdp; /* Read Data Port */ | 52 | static int isapnp_rdp; /* Read Data Port */ |
@@ -93,7 +90,6 @@ MODULE_LICENSE("GPL"); | |||
93 | 90 | ||
94 | static unsigned char isapnp_checksum_value; | 91 | static unsigned char isapnp_checksum_value; |
95 | static DEFINE_MUTEX(isapnp_cfg_mutex); | 92 | static DEFINE_MUTEX(isapnp_cfg_mutex); |
96 | static int isapnp_detected; | ||
97 | static int isapnp_csn_count; | 93 | static int isapnp_csn_count; |
98 | 94 | ||
99 | /* some prototypes */ | 95 | /* some prototypes */ |
@@ -1067,7 +1063,6 @@ static int __init isapnp_init(void) | |||
1067 | struct pnp_dev *dev; | 1063 | struct pnp_dev *dev; |
1068 | 1064 | ||
1069 | if (isapnp_disable) { | 1065 | if (isapnp_disable) { |
1070 | isapnp_detected = 0; | ||
1071 | printk(KERN_INFO "isapnp: ISA Plug & Play support disabled\n"); | 1066 | printk(KERN_INFO "isapnp: ISA Plug & Play support disabled\n"); |
1072 | return 0; | 1067 | return 0; |
1073 | } | 1068 | } |
@@ -1115,7 +1110,6 @@ static int __init isapnp_init(void) | |||
1115 | } | 1110 | } |
1116 | isapnp_set_rdp(); | 1111 | isapnp_set_rdp(); |
1117 | } | 1112 | } |
1118 | isapnp_detected = 1; | ||
1119 | if (isapnp_rdp < 0x203 || isapnp_rdp > 0x3ff) { | 1113 | if (isapnp_rdp < 0x203 || isapnp_rdp > 0x3ff) { |
1120 | cards = isapnp_isolate(); | 1114 | cards = isapnp_isolate(); |
1121 | if (cards < 0 || (isapnp_rdp < 0x203 || isapnp_rdp > 0x3ff)) { | 1115 | if (cards < 0 || (isapnp_rdp < 0x203 || isapnp_rdp > 0x3ff)) { |
@@ -1123,7 +1117,6 @@ static int __init isapnp_init(void) | |||
1123 | release_region(_PIDXR, 1); | 1117 | release_region(_PIDXR, 1); |
1124 | #endif | 1118 | #endif |
1125 | release_region(_PNPWRP, 1); | 1119 | release_region(_PNPWRP, 1); |
1126 | isapnp_detected = 0; | ||
1127 | printk(KERN_INFO | 1120 | printk(KERN_INFO |
1128 | "isapnp: No Plug & Play device found\n"); | 1121 | "isapnp: No Plug & Play device found\n"); |
1129 | return 0; | 1122 | return 0; |