Merge branch 'master' into tk71

[mv-sheeva.git] / drivers / misc / kgdbts.c

diff --git a/drivers/misc/kgdbts.c b/drivers/misc/kgdbts.c
index 72450237a0f418e0a41552cbdefd7943545add78..59c118c19a910e9950a04a069dacf62352a25e9a 100644 (file)
--- a/drivers/misc/kgdbts.c
+++ b/drivers/misc/kgdbts.c
@@ -1044,12 +1044,6 @@ static int __init init_kgdbts(void)
        return configure_kgdbts();
 }
 
-static void cleanup_kgdbts(void)
-{
-       if (configured == 1)
-               kgdb_unregister_io_module(&kgdbts_io_ops);
-}
-
 static int kgdbts_get_char(void)
 {
        int val = 0;
@@ -1081,10 +1075,8 @@ static int param_set_kgdbts_var(const char *kmessage, struct kernel_param *kp)
                return 0;
        }
 
-       if (kgdb_connected) {
-               printk(KERN_ERR
-              "kgdbts: Cannot reconfigure while KGDB is connected.\n");
-
+       if (configured == 1) {
+               printk(KERN_ERR "kgdbts: ERROR: Already configured and running.\n");
                return -EBUSY;
        }
 
@@ -1093,9 +1085,6 @@ static int param_set_kgdbts_var(const char *kmessage, struct kernel_param *kp)
        if (config[len - 1] == '\n')
                config[len - 1] = '\0';
 
-       if (configured == 1)
-               cleanup_kgdbts();
-
        /* Go and configure with the new params. */
        return configure_kgdbts();
 }
@@ -1123,7 +1112,6 @@ static struct kgdb_io kgdbts_io_ops = {
 };
 
 module_init(init_kgdbts);
-module_exit(cleanup_kgdbts);
 module_param_call(kgdbts, param_set_kgdbts_var, param_get_string, &kps, 0644);
 MODULE_PARM_DESC(kgdbts, "<A|V1|V2>[F#|S#][N#]");
 MODULE_DESCRIPTION("KGDB Test Suite");