[PATCH] staging: unisys: virtpci: virtpci.c: Removes unnecessary NULL check

[Rickard Strandqvist]

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

Signed-off-by: Rickard Strandqvist <rickard_strandqv...@spectrumdigital.se>
---
 drivers/staging/unisys/virtpci/virtpci.c |   29 +++++++++--------------------
 1 file changed, 9 insertions(+), 20 deletions(-)

diff --git a/drivers/staging/unisys/virtpci/virtpci.c 
b/drivers/staging/unisys/virtpci/virtpci.c
index ee9f826..37b94de 100644
--- a/drivers/staging/unisys/virtpci/virtpci.c
+++ b/drivers/staging/unisys/virtpci/virtpci.c
@@ -1314,18 +1314,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;
 }
 
@@ -1337,19 +1332,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;
 }
 
-- 
1.7.10.4

_______________________________________________
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel