Commit 6c504d30 authored by Bjorn Helgaas's avatar Bjorn Helgaas Committed by Len Brown

ISAPNP: removed unused isapnp_detected and ISAPNP_DEBUG

ISAPNP_DEBUG isn't used at all.  isapnp_detected is set but never read.
So remove them both.
Signed-off-by: default avatarBjorn Helgaas <bjorn.helgaas@hp.com>
Acked-by: default avatarAdam Belay <abelay@novell.com>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 4721a4cc
...@@ -47,9 +47,6 @@ ...@@ -47,9 +47,6 @@
#if 0 #if 0
#define ISAPNP_REGION_OK #define ISAPNP_REGION_OK
#endif #endif
#if 0
#define ISAPNP_DEBUG
#endif
int isapnp_disable; /* Disable ISA PnP */ int isapnp_disable; /* Disable ISA PnP */
static int isapnp_rdp; /* Read Data Port */ static int isapnp_rdp; /* Read Data Port */
...@@ -93,7 +90,6 @@ MODULE_LICENSE("GPL"); ...@@ -93,7 +90,6 @@ MODULE_LICENSE("GPL");
static unsigned char isapnp_checksum_value; static unsigned char isapnp_checksum_value;
static DEFINE_MUTEX(isapnp_cfg_mutex); static DEFINE_MUTEX(isapnp_cfg_mutex);
static int isapnp_detected;
static int isapnp_csn_count; static int isapnp_csn_count;
/* some prototypes */ /* some prototypes */
...@@ -1067,7 +1063,6 @@ static int __init isapnp_init(void) ...@@ -1067,7 +1063,6 @@ static int __init isapnp_init(void)
struct pnp_dev *dev; struct pnp_dev *dev;
if (isapnp_disable) { if (isapnp_disable) {
isapnp_detected = 0;
printk(KERN_INFO "isapnp: ISA Plug & Play support disabled\n"); printk(KERN_INFO "isapnp: ISA Plug & Play support disabled\n");
return 0; return 0;
} }
...@@ -1115,7 +1110,6 @@ static int __init isapnp_init(void) ...@@ -1115,7 +1110,6 @@ static int __init isapnp_init(void)
} }
isapnp_set_rdp(); isapnp_set_rdp();
} }
isapnp_detected = 1;
if (isapnp_rdp < 0x203 || isapnp_rdp > 0x3ff) { if (isapnp_rdp < 0x203 || isapnp_rdp > 0x3ff) {
cards = isapnp_isolate(); cards = isapnp_isolate();
if (cards < 0 || (isapnp_rdp < 0x203 || isapnp_rdp > 0x3ff)) { if (cards < 0 || (isapnp_rdp < 0x203 || isapnp_rdp > 0x3ff)) {
...@@ -1123,7 +1117,6 @@ static int __init isapnp_init(void) ...@@ -1123,7 +1117,6 @@ static int __init isapnp_init(void)
release_region(_PIDXR, 1); release_region(_PIDXR, 1);
#endif #endif
release_region(_PNPWRP, 1); release_region(_PNPWRP, 1);
isapnp_detected = 0;
printk(KERN_INFO printk(KERN_INFO
"isapnp: No Plug & Play device found\n"); "isapnp: No Plug & Play device found\n");
return 0; return 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment