[S390] ccw_driver: remove duplicate members

Remove the owner and name members of struct
ccw_driver and convert all drivers to store
this data in the embedded struct device_driver.

Signed-off-by: Sebastian Ott <sebott@linux.vnet.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

1 files changed, 2 insertions, 4 deletions

diff --git a/drivers/s390/cio/device.c b/drivers/s390/cio/device.c
index e50b12163afe..334459eb23c8 100644
--- a/drivers/s390/cio/device.c
+++ b/drivers/s390/cio/device.c
@@ -547,7 +547,7 @@ static ssize_t online_store (struct device *dev, struct device_attribute *attr,
         if (atomic_cmpxchg(&cdev->private->onoff, 0, 1) != 0)
                 return -EAGAIN;
 
-        if (cdev->drv && !try_module_get(cdev->drv->owner)) {
+        if (cdev->drv && !try_module_get(cdev->drv->driver.owner)) {
                 atomic_set(&cdev->private->onoff, 0);
                 return -EINVAL;
         }
@@ -573,7 +573,7 @@ static ssize_t online_store (struct device *dev, struct device_attribute *attr,
         }
 out:
         if (cdev->drv)
-                module_put(cdev->drv->owner);
+                module_put(cdev->drv->driver.owner);
         atomic_set(&cdev->private->onoff, 0);
         return (ret < 0) ? ret : count;
 }
@@ -1993,8 +1993,6 @@ int ccw_driver_register(struct ccw_driver *cdriver)
         struct device_driver *drv = &cdriver->driver;
 
         drv->bus = &ccw_bus_type;
-        drv->name = cdriver->name;
-        drv->owner = cdriver->owner;
 
         return driver_register(drv);
 }