[ALSA] Changed Jaroslav Kysela's e-mail from perex@suse.cz to perex@perex.cz

[net-next-2.6.git] / drivers / pnp / isapnp / core.c

diff --git a/drivers/pnp/isapnp/core.c b/drivers/pnp/isapnp/core.c
index b4e2aa995b53160ef5056ea2180b95ff2e05b300..2c925b7cd93e356fab3af1cfd3689199594904ec 100644 (file)
--- a/drivers/pnp/isapnp/core.c
+++ b/drivers/pnp/isapnp/core.c
@@ -1,6 +1,6 @@
 /*
  *  ISA Plug & Play support
- *  Copyright (c) by Jaroslav Kysela <perex@suse.cz>
+ *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
  *
  *
  *   This program is free software; you can redistribute it and/or modify
@@ -47,16 +47,13 @@
 #if 0
 #define ISAPNP_REGION_OK
 #endif
-#if 0
-#define ISAPNP_DEBUG
-#endif
 
 int isapnp_disable;            /* Disable ISA PnP */
 static int isapnp_rdp;         /* Read Data Port */
 static int isapnp_reset = 1;   /* reset all PnP cards (deactivate) */
 static int isapnp_verbose = 1; /* verbose mode */
 
-MODULE_AUTHOR("Jaroslav Kysela <perex@suse.cz>");
+MODULE_AUTHOR("Jaroslav Kysela <perex@perex.cz>");
 MODULE_DESCRIPTION("Generic ISA Plug & Play support");
 module_param(isapnp_disable, int, 0);
 MODULE_PARM_DESC(isapnp_disable, "ISA Plug & Play disable");
@@ -93,7 +90,6 @@ MODULE_LICENSE("GPL");
 
 static unsigned char isapnp_checksum_value;
 static DEFINE_MUTEX(isapnp_cfg_mutex);
-static int isapnp_detected;
 static int isapnp_csn_count;
 
 /* some prototypes */
@@ -335,7 +331,7 @@ static int __init isapnp_isolate(void)
                } else if (iteration > 1) {
                        break;
                }
-             __next:
+__next:
                if (csn == 255)
                        break;
                checksum = 0x6a;
@@ -733,7 +729,7 @@ static int __init isapnp_create_device(struct pnp_card *card,
                               "isapnp: unexpected or unknown tag type 0x%x for logical device %i (device %i), ignored\n",
                               type, dev->number, card->number);
                }
-             __skip:
+__skip:
                if (size > 0)
                        isapnp_skip_bytes(size);
        }
@@ -788,7 +784,7 @@ static void __init isapnp_parse_resource_map(struct pnp_card *card)
                               "isapnp: unexpected or unknown tag type 0x%x for device %i, ignored\n",
                               type, card->number);
                }
-             __skip:
+__skip:
                if (size > 0)
                        isapnp_skip_bytes(size);
        }
@@ -940,9 +936,6 @@ EXPORT_SYMBOL(isapnp_protocol);
 EXPORT_SYMBOL(isapnp_present);
 EXPORT_SYMBOL(isapnp_cfg_begin);
 EXPORT_SYMBOL(isapnp_cfg_end);
-#if 0
-EXPORT_SYMBOL(isapnp_read_byte);
-#endif
 EXPORT_SYMBOL(isapnp_write_byte);
 
 static int isapnp_read_resources(struct pnp_dev *dev,
@@ -993,6 +986,7 @@ static int isapnp_get_resources(struct pnp_dev *dev,
                                struct pnp_resource_table *res)
 {
        int ret;
+
        pnp_init_resource_table(res);
        isapnp_cfg_begin(dev->card->number, dev->number);
        ret = isapnp_read_resources(dev, res);
@@ -1046,7 +1040,7 @@ static int isapnp_set_resources(struct pnp_dev *dev,
 
 static int isapnp_disable_resources(struct pnp_dev *dev)
 {
-       if (!dev || !dev->active)
+       if (!dev->active)
                return -EINVAL;
        isapnp_cfg_begin(dev->card->number, dev->number);
        isapnp_deactivate(dev->number);
@@ -1069,7 +1063,6 @@ static int __init isapnp_init(void)
        struct pnp_dev *dev;
 
        if (isapnp_disable) {
-               isapnp_detected = 0;
                printk(KERN_INFO "isapnp: ISA Plug & Play support disabled\n");
                return 0;
        }
@@ -1117,7 +1110,6 @@ static int __init isapnp_init(void)
                }
                isapnp_set_rdp();
        }
-       isapnp_detected = 1;
        if (isapnp_rdp < 0x203 || isapnp_rdp > 0x3ff) {
                cards = isapnp_isolate();
                if (cards < 0 || (isapnp_rdp < 0x203 || isapnp_rdp > 0x3ff)) {
@@ -1125,7 +1117,6 @@ static int __init isapnp_init(void)
                        release_region(_PIDXR, 1);
 #endif
                        release_region(_PNPWRP, 1);
-                       isapnp_detected = 0;
                        printk(KERN_INFO
                               "isapnp: No Plug & Play device found\n");
                        return 0;
@@ -1148,13 +1139,12 @@ static int __init isapnp_init(void)
                        }
                }
        }
-       if (cards) {
+       if (cards)
                printk(KERN_INFO
                       "isapnp: %i Plug & Play card%s detected total\n", cards,
                       cards > 1 ? "s" : "");
-       } else {
+       else
                printk(KERN_INFO "isapnp: No Plug & Play card found\n");
-       }
 
        isapnp_proc_init();
        return 0;