9 files changed, 16 insertions, 48 deletions

diff --git a/drivers/md/dm-crypt.c b/drivers/md/dm-crypt.c
index 3326750ec02c..35bda49796fb 100644
--- a/drivers/md/dm-crypt.c
+++ b/drivers/md/dm-crypt.c
@@ -1322,11 +1322,7 @@ static int __init dm_crypt_init(void)
 
 static void __exit dm_crypt_exit(void)
 {
-        int r = dm_unregister_target(&crypt_target);
-
-        if (r < 0)
-                DMERR("unregister failed %d", r);
-
+        dm_unregister_target(&crypt_target);
         kmem_cache_destroy(_crypt_io_pool);
 }
 
diff --git a/drivers/md/dm-delay.c b/drivers/md/dm-delay.c
index 848b381f1173..59ee1b015d2d 100644
--- a/drivers/md/dm-delay.c
+++ b/drivers/md/dm-delay.c
@@ -364,11 +364,7 @@ bad_queue:
 
 static void __exit dm_delay_exit(void)
 {
-        int r = dm_unregister_target(&delay_target);
-
-        if (r < 0)
-                DMERR("unregister failed %d", r);
-
+        dm_unregister_target(&delay_target);
         kmem_cache_destroy(delayed_cache);
         destroy_workqueue(kdelayd_wq);
 }
diff --git a/drivers/md/dm-linear.c b/drivers/md/dm-linear.c
index 44042becad8a..79fb53e51c70 100644
--- a/drivers/md/dm-linear.c
+++ b/drivers/md/dm-linear.c
@@ -156,8 +156,5 @@ int __init dm_linear_init(void)
 
 void dm_linear_exit(void)
 {
-        int r = dm_unregister_target(&linear_target);
-
-        if (r < 0)
-                DMERR("unregister failed %d", r);
+        dm_unregister_target(&linear_target);
 }
diff --git a/drivers/md/dm-mpath.c b/drivers/md/dm-mpath.c
index 3d7f4923cd13..345a26047ae0 100644
--- a/drivers/md/dm-mpath.c
+++ b/drivers/md/dm-mpath.c
@@ -1495,14 +1495,10 @@ static int __init dm_multipath_init(void)
 
 static void __exit dm_multipath_exit(void)
 {
-        int r;
-
         destroy_workqueue(kmpath_handlerd);
         destroy_workqueue(kmultipathd);
 
-        r = dm_unregister_target(&multipath_target);
-        if (r < 0)
-                DMERR("target unregister failed %d", r);
+        dm_unregister_target(&multipath_target);
         kmem_cache_destroy(_mpio_cache);
 }
 
diff --git a/drivers/md/dm-raid1.c b/drivers/md/dm-raid1.c
index d0fed2b21b08..250f401668d5 100644
--- a/drivers/md/dm-raid1.c
+++ b/drivers/md/dm-raid1.c
@@ -1300,11 +1300,7 @@ static int __init dm_mirror_init(void)
 
 static void __exit dm_mirror_exit(void)
 {
-        int r;
-
-        r = dm_unregister_target(&mirror_target);
-        if (r < 0)
-                DMERR("unregister failed %d", r);
+        dm_unregister_target(&mirror_target);
 }
 
 /* Module hooks */
diff --git a/drivers/md/dm-snap.c b/drivers/md/dm-snap.c
index 4ceedd4f22af..a8005b43a06b 100644
--- a/drivers/md/dm-snap.c
+++ b/drivers/md/dm-snap.c
@@ -1470,17 +1470,10 @@ static int __init dm_snapshot_init(void)
 
 static void __exit dm_snapshot_exit(void)
 {
-        int r;
-
         destroy_workqueue(ksnapd);
 
-        r = dm_unregister_target(&snapshot_target);
-        if (r)
-                DMERR("snapshot unregister failed %d", r);
-
-        r = dm_unregister_target(&origin_target);
-        if (r)
-                DMERR("origin unregister failed %d", r);
+        dm_unregister_target(&snapshot_target);
+        dm_unregister_target(&origin_target);
 
         exit_origin_hash();
         kmem_cache_destroy(pending_cache);
diff --git a/drivers/md/dm-stripe.c b/drivers/md/dm-stripe.c
index 9e4ef88d421e..41569bc60abc 100644
--- a/drivers/md/dm-stripe.c
+++ b/drivers/md/dm-stripe.c
@@ -337,9 +337,7 @@ int __init dm_stripe_init(void)
 
 void dm_stripe_exit(void)
 {
-        if (dm_unregister_target(&stripe_target))
-                DMWARN("target unregistration failed");
-
+        dm_unregister_target(&stripe_target);
         destroy_workqueue(kstriped);
 
         return;
diff --git a/drivers/md/dm-target.c b/drivers/md/dm-target.c
index 835cf95b857f..7decf10006e4 100644
--- a/drivers/md/dm-target.c
+++ b/drivers/md/dm-target.c
@@ -130,26 +130,26 @@ int dm_register_target(struct target_type *t)
         return rv;
 }
 
-int dm_unregister_target(struct target_type *t)
+void dm_unregister_target(struct target_type *t)
 {
         struct tt_internal *ti;
 
         down_write(&_lock);
         if (!(ti = __find_target_type(t->name))) {
-                up_write(&_lock);
-                return -EINVAL;
+                DMCRIT("Unregistering unrecognised target: %s", t->name);
+                BUG();
         }
 
         if (ti->use) {
-                up_write(&_lock);
-                return -ETXTBSY;
+                DMCRIT("Attempt to unregister target still in use: %s",
+                       t->name);
+                BUG();
         }
 
         list_del(&ti->list);
         kfree(ti);
 
         up_write(&_lock);
-        return 0;
 }
 
 /*
@@ -187,8 +187,7 @@ int __init dm_target_init(void)
 
 void dm_target_exit(void)
 {
-        if (dm_unregister_target(&error_target))
-                DMWARN("error target unregistration failed");
+        dm_unregister_target(&error_target);
 }
 
 EXPORT_SYMBOL(dm_register_target);
diff --git a/drivers/md/dm-zero.c b/drivers/md/dm-zero.c
index cdbf126ec106..bbc97030c0c2 100644
--- a/drivers/md/dm-zero.c
+++ b/drivers/md/dm-zero.c
@@ -69,10 +69,7 @@ static int __init dm_zero_init(void)
 
 static void __exit dm_zero_exit(void)
 {
-        int r = dm_unregister_target(&zero_target);
-
-        if (r < 0)
-                DMERR("unregister failed %d", r);
+        dm_unregister_target(&zero_target);
 }
 
 module_init(dm_zero_init)