staging: unisys: visorbus: visorbus_main.c: remove extra checks for dev->visorchannel

Removed checks for dev->visorchannel in visorbus_release_device()
and visorbus_remove_instance() since it is also checked in the
visorchannel_destroy() function.

Signed-off-by: Sameer Wadgaonkar <sameer.wadgaonkar@unisys.com>
Signed-off-by: David Kershner <david.kershner@unisys.com>
Reviewed-by: David Binder <david.binder@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/unisys/visorbus/visorbus_main.c b/drivers/staging/unisys/visorbus/visorbus_main.c
index 1a212ecdd4fa7ec7b816ff3b51add345d667dbe8..bdebd58cae8606f3a60d65a61f575bad633d1eb2 100644 (file)
--- a/drivers/staging/unisys/visorbus/visorbus_main.c
+++ b/drivers/staging/unisys/visorbus/visorbus_main.c
@@ -156,10 +156,7 @@ visorbus_release_device(struct device *xdev)
 {
        struct visor_device *dev = to_visor_device(xdev);
 
-       if (dev->visorchannel) {
-               visorchannel_destroy(dev->visorchannel);
-               dev->visorchannel = NULL;
-       }
+       visorchannel_destroy(dev->visorchannel);
        kfree(dev);
 }
 
@@ -1058,10 +1055,7 @@ visorbus_remove_instance(struct visor_device *dev)
         * successfully been able to trace thru the code to see where/how
         * release() gets called.  But I know it does.
         */
-       if (dev->visorchannel) {
-               visorchannel_destroy(dev->visorchannel);
-               dev->visorchannel = NULL;
-       }
+       visorchannel_destroy(dev->visorchannel);
        kfree(dev->vbus_hdr_info);
        list_del(&dev->list_all);
        device_unregister(&dev->device);