s390: remove driver_data direct access of struct device

In the near future, the driver core is going to not allow direct access
to the driver_data pointer in struct device.  Instead, the functions
dev_get_drvdata() and dev_set_drvdata() should be used.  These functions
have been around since the beginning, so are backwards compatible with
all older kernel versions.

Thanks to Sebastian Ott <sebott@linux.vnet.ibm.com> for fixing a few
typos in my original version of this patch.

Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: Sebastian Ott <sebott@linux.vnet.ibm.com>
Cc: linux-s390@vger.kernel.org
Cc: linux390@de.ibm.com
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

1 files changed, 10 insertions, 10 deletions

diff --git a/drivers/s390/net/lcs.c b/drivers/s390/net/lcs.c
index a45bc24eb5f9..ba6d45d29ad4 100644
--- a/drivers/s390/net/lcs.c
+++ b/drivers/s390/net/lcs.c
@@ -1939,7 +1939,7 @@ lcs_portno_show (struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct lcs_card *card;
 
-        card = (struct lcs_card *)dev->driver_data;
+        card = dev_get_drvdata(dev);
 
         if (!card)
                 return 0;
@@ -1956,7 +1956,7 @@ lcs_portno_store (struct device *dev, struct device_attribute *attr, const char
         struct lcs_card *card;
         int value;
 
-        card = (struct lcs_card *)dev->driver_data;
+        card = dev_get_drvdata(dev);
 
         if (!card)
                 return 0;
@@ -1990,7 +1990,7 @@ lcs_timeout_show(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct lcs_card *card;
 
-        card = (struct lcs_card *)dev->driver_data;
+        card = dev_get_drvdata(dev);
 
         return card ? sprintf(buf, "%u\n", card->lancmd_timeout) : 0;
 }
@@ -2001,7 +2001,7 @@ lcs_timeout_store (struct device *dev, struct device_attribute *attr, const char
         struct lcs_card *card;
         int value;
 
-        card = (struct lcs_card *)dev->driver_data;
+        card = dev_get_drvdata(dev);
 
         if (!card)
                 return 0;
@@ -2020,7 +2020,7 @@ static ssize_t
 lcs_dev_recover_store(struct device *dev, struct device_attribute *attr,
                       const char *buf, size_t count)
 {
-        struct lcs_card *card = dev->driver_data;
+        struct lcs_card *card = dev_get_drvdata(dev);
         char *tmp;
         int i;
 
@@ -2073,7 +2073,7 @@ lcs_probe_device(struct ccwgroup_device *ccwgdev)
                 put_device(&ccwgdev->dev);
                 return ret;
         }
-        ccwgdev->dev.driver_data = card;
+        dev_set_drvdata(&ccwgdev->dev, card);
         ccwgdev->cdev[0]->handler = lcs_irq;
         ccwgdev->cdev[1]->handler = lcs_irq;
         card->gdev = ccwgdev;
@@ -2090,7 +2090,7 @@ lcs_register_netdev(struct ccwgroup_device *ccwgdev)
         struct lcs_card *card;
 
         LCS_DBF_TEXT(2, setup, "regnetdv");
-        card = (struct lcs_card *)ccwgdev->dev.driver_data;
+        card = dev_get_drvdata(&ccwgdev->dev);
         if (card->dev->reg_state != NETREG_UNINITIALIZED)
                 return 0;
         SET_NETDEV_DEV(card->dev, &ccwgdev->dev);
@@ -2123,7 +2123,7 @@ lcs_new_device(struct ccwgroup_device *ccwgdev)
         enum lcs_dev_states recover_state;
         int rc;
 
-        card = (struct lcs_card *)ccwgdev->dev.driver_data;
+        card = dev_get_drvdata(&ccwgdev->dev);
         if (!card)
                 return -ENODEV;
 
@@ -2229,7 +2229,7 @@ __lcs_shutdown_device(struct ccwgroup_device *ccwgdev, int recovery_mode)
         int ret;
 
         LCS_DBF_TEXT(3, setup, "shtdndev");
-        card = (struct lcs_card *)ccwgdev->dev.driver_data;
+        card = dev_get_drvdata(&ccwgdev->dev);
         if (!card)
                 return -ENODEV;
         if (recovery_mode == 0) {
@@ -2296,7 +2296,7 @@ lcs_remove_device(struct ccwgroup_device *ccwgdev)
 {
         struct lcs_card *card;
 
-        card = (struct lcs_card *)ccwgdev->dev.driver_data;
+        card = dev_get_drvdata(&ccwgdev->dev);
         if (!card)
                 return;