staging: unisys: virtpci: virtpci.c: Removes unnecessary NULL check

It is impossible for dprivate to ever be NULL, no check required.

Signed-off-by: Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/unisys/virtpci/virtpci.c b/drivers/staging/unisys/virtpci/virtpci.c
index 39b828dce503141a11158bd2e0447f6c4ee42b79..bc6e23707d3a5d21385b6c50597e4d768a846248 100644 (file)
--- a/drivers/staging/unisys/virtpci/virtpci.c
+++ b/drivers/staging/unisys/virtpci/virtpci.c
@@ -1338,18 +1338,13 @@ static ssize_t virtpci_driver_attr_show(struct kobject *kobj,
        ssize_t ret = 0;
 
        struct driver_private *dprivate = to_driver(kobj);
-       struct device_driver *driver;
+       struct device_driver *driver = dprivate->driver;
 
-       if (dprivate != NULL)
-               driver = dprivate->driver;
-       else
-               driver = NULL;
+       DBGINF("In virtpci_driver_attr_show driver->name:%s\n", driver->name);
+
+       if (dattr->show)
+               ret = dattr->show(driver, buf);
 
-       DBGINF("In virtpci_driver_attr_show driver->name:%s\n", driver->name);
-       if (driver) {
-               if (dattr->show)
-                       ret = dattr->show(driver, buf);
-       }
        return ret;
 }
 
@@ -1361,19 +1356,13 @@ static ssize_t virtpci_driver_attr_store(struct kobject *kobj,
        ssize_t ret = 0;
 
        struct driver_private *dprivate = to_driver(kobj);
-       struct device_driver *driver;
-
-       if (dprivate != NULL)
-               driver = dprivate->driver;
-       else
-               driver = NULL;
+       struct device_driver *driver = dprivate->driver;
 
        DBGINF("In virtpci_driver_attr_store driver->name:%s\n", driver->name);
 
-       if (driver) {
-               if (dattr->store)
-                       ret = dattr->store(driver, buf, count);
-       }
+       if (dattr->store)
+               ret = dattr->store(driver, buf, count);
+
        return ret;
 }