9 files changed, 9 insertions, 31 deletions

diff --git a/arch/cris/arch-v10/drivers/pcf8563.c b/arch/cris/arch-v10/drivers/pcf8563.c
index d47cfbf98d6e..1de0026bb94e 100644
--- a/arch/cris/arch-v10/drivers/pcf8563.c
+++ b/arch/cris/arch-v10/drivers/pcf8563.c
@@ -180,9 +180,7 @@ err:
 void __exit
 pcf8563_exit(void)
 {
-        if (unregister_chrdev(PCF8563_MAJOR, DEVICE_NAME) < 0) {
-                printk(KERN_INFO "%s: Unable to unregister device.\n", PCF8563_NAME);
-        }
+        unregister_chrdev(PCF8563_MAJOR, DEVICE_NAME);
 }
 
 /*
diff --git a/arch/cris/arch-v32/drivers/pcf8563.c b/arch/cris/arch-v32/drivers/pcf8563.c
index fa8d50007e4c..da479a14f836 100644
--- a/arch/cris/arch-v32/drivers/pcf8563.c
+++ b/arch/cris/arch-v32/drivers/pcf8563.c
@@ -193,9 +193,7 @@ err:
 void __exit
 pcf8563_exit(void)
 {
-        if (unregister_chrdev(PCF8563_MAJOR, DEVICE_NAME) < 0) {
-                printk(KERN_INFO "%s: Unable to unregister device.\n", PCF8563_NAME);
-        }
+        unregister_chrdev(PCF8563_MAJOR, DEVICE_NAME);
 }
 
 /*
diff --git a/arch/sparc64/solaris/socksys.c b/arch/sparc64/solaris/socksys.c
index e94f6e5d9455..7736411f244f 100644
--- a/arch/sparc64/solaris/socksys.c
+++ b/arch/sparc64/solaris/socksys.c
@@ -199,6 +199,5 @@ int __init init_socksys(void)
 
 void __exit cleanup_socksys(void)
 {
-        if (unregister_chrdev(30, "socksys"))
-                printk ("Couldn't unregister socksys character device\n");
+        unregister_chrdev(30, "socksys");
 }
diff --git a/drivers/char/ip2/ip2main.c b/drivers/char/ip2/ip2main.c
index 83c7258d3580..6005b5225772 100644
--- a/drivers/char/ip2/ip2main.c
+++ b/drivers/char/ip2/ip2main.c
@@ -425,9 +425,7 @@ cleanup_module(void)
                 printk(KERN_ERR "IP2: failed to unregister tty driver (%d)\n", err);
         }
         put_tty_driver(ip2_tty_driver);
-        if ( ( err = unregister_chrdev ( IP2_IPL_MAJOR, pcIpl ) ) ) {
-                printk(KERN_ERR "IP2: failed to unregister IPL driver (%d)\n", err);
-        }
+        unregister_chrdev(IP2_IPL_MAJOR, pcIpl);
         remove_proc_entry("ip2mem", &proc_root);
 
         // free memory
diff --git a/drivers/char/mbcs.c b/drivers/char/mbcs.c
index 57f9115a456c..3daf5e0a27e1 100644
--- a/drivers/char/mbcs.c
+++ b/drivers/char/mbcs.c
@@ -816,12 +816,7 @@ struct cx_drv mbcs_driver = {
 
 static void __exit mbcs_exit(void)
 {
-        int rv;
-
-        rv = unregister_chrdev(mbcs_major, DEVICE_NAME);
-        if (rv < 0)
-                DBG(KERN_ALERT "Error in unregister_chrdev: %d\n", rv);
-
+        unregister_chrdev(mbcs_major, DEVICE_NAME);
         cx_driver_unregister(&mbcs_driver);
 }
 
diff --git a/drivers/char/stallion.c b/drivers/char/stallion.c
index 93d0bb8b4c0f..4a80b2f864e0 100644
--- a/drivers/char/stallion.c
+++ b/drivers/char/stallion.c
@@ -4795,7 +4795,6 @@ static void __exit stallion_module_exit(void)
 {
         struct stlbrd *brdp;
         unsigned int i, j;
-        int retval;
 
         pr_debug("cleanup_module()\n");
 
@@ -4818,9 +4817,7 @@ static void __exit stallion_module_exit(void)
 
         for (i = 0; i < 4; i++)
                 class_device_destroy(stallion_class, MKDEV(STL_SIOMEMMAJOR, i));
-        if ((retval = unregister_chrdev(STL_SIOMEMMAJOR, "staliomem")))
-                printk("STALLION: failed to un-register serial memory device, "
-                        "errno=%d\n", -retval);
+        unregister_chrdev(STL_SIOMEMMAJOR, "staliomem");
         class_destroy(stallion_class);
 
         pci_unregister_driver(&stl_pcidriver);
diff --git a/drivers/char/viotape.c b/drivers/char/viotape.c
index db57277117bb..e12275df6ea2 100644
--- a/drivers/char/viotape.c
+++ b/drivers/char/viotape.c
@@ -1098,15 +1098,10 @@ static int chg_state(int index, unsigned char new_state, struct file *file)
 /* Cleanup */
 static void __exit viotap_exit(void)
 {
-        int ret;
-
         remove_proc_entry("iSeries/viotape", NULL);
         vio_unregister_driver(&viotape_driver);
         class_destroy(tape_class);
-        ret = unregister_chrdev(VIOTAPE_MAJOR, "viotape");
-        if (ret < 0)
-                printk(VIOTAPE_KERN_WARN "Error unregistering device: %d\n",
-                                ret);
+        unregister_chrdev(VIOTAPE_MAJOR, "viotape");
         if (viotape_unitinfo)
                 dma_free_coherent(iSeries_vio_dev,
                                 sizeof(viotape_unitinfo[0]) * VIOTAPE_MAX_TAPE,
diff --git a/drivers/net/ppp_generic.c b/drivers/net/ppp_generic.c
index 3ef0092dc09c..ef3325b69233 100644
--- a/drivers/net/ppp_generic.c
+++ b/drivers/net/ppp_generic.c
@@ -2684,8 +2684,7 @@ static void __exit ppp_cleanup(void)
         if (atomic_read(&ppp_unit_count) || atomic_read(&channel_count))
                 printk(KERN_ERR "PPP: removing module but units remain!\n");
         cardmap_destroy(&all_ppp_units);
-        if (unregister_chrdev(PPP_MAJOR, "ppp") != 0)
-                printk(KERN_ERR "PPP: failed to unregister PPP device\n");
+        unregister_chrdev(PPP_MAJOR, "ppp");
         device_destroy(ppp_class, MKDEV(PPP_MAJOR, 0));
         class_destroy(ppp_class);
 }
diff --git a/sound/core/sound.c b/sound/core/sound.c
index 70600df94d62..8dc7a3b32b98 100644
--- a/sound/core/sound.c
+++ b/sound/core/sound.c
@@ -446,8 +446,7 @@ static void __exit alsa_sound_exit(void)
 {
         snd_info_minor_unregister();
         snd_info_done();
-        if (unregister_chrdev(major, "alsa") != 0)
-                snd_printk(KERN_ERR "unable to unregister major device number %d\n", major);
+        unregister_chrdev(major, "alsa");
 }
 
 module_init(alsa_sound_init)