[PATCH 50/64] hvcs: remove driver_data direct access of struct device

From: Greg Kroah-Hartman
Date: Tue Jun 16 2009 - 02:02:48 EST

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.

Cc: Paul Mackerras <paulus@xxxxxxxxx>
Acked-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Cc: Roel Kluin <roel.kluin@xxxxxxxxx>
Cc: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
drivers/char/hvcs.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/char/hvcs.c b/drivers/char/hvcs.c
index c76bccf..7d64e42 100644
--- a/drivers/char/hvcs.c
+++ b/drivers/char/hvcs.c
@@ -347,7 +347,7 @@ static void __exit hvcs_module_exit(void);

static inline struct hvcs_struct *from_vio_dev(struct vio_dev *viod)
- return viod->dev.driver_data;
+ return dev_get_drvdata(&viod->dev);
/* The sysfs interface for the driver and devices */

@@ -785,7 +785,7 @@ static int __devinit hvcs_probe(

hvcsd->vdev = dev;
- dev->dev.driver_data = hvcsd;
+ dev_set_drvdata(&dev->dev, hvcsd);

hvcsd->index = index;

@@ -831,7 +831,7 @@ static int __devinit hvcs_probe(

static int __devexit hvcs_remove(struct vio_dev *dev)
- struct hvcs_struct *hvcsd = dev->dev.driver_data;
+ struct hvcs_struct *hvcsd = dev_get_drvdata(&dev->dev);
unsigned long flags;
struct tty_struct *tty;


To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/