Skip to contentSkip to conversation

hvcs: remove driver_data direct access of struct device

PATCH In review Greg Kroah-Hartman 3 participants 3 messages May 4, 2009 – May 11, 2009 Char and misc drivers

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 hvcs: remove driver_data direct access of struct device

From: Greg Kroah-Hartman <[email protected]>

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 <[email protected]>
Cc Stephen Rothwell <[email protected]>
Cc Roel Kluin <[email protected]>
Cc Benjamin Herrenschmidt <[email protected]>
---
 drivers/char/hvcs.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/char/hvcs.c +3 -3
@@ -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(
 	kref_init(&hvcsd->kref);
 
 	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;
 
Acked-by on v1 1/1
#1 lore raw
Quoted 9 lines · On Mon, 4 May 2009 12:58:01 -0700 Greg Kroah-Hartman <[email protected]> wrote:

From: Greg Kroah-Hartman <[email protected]>

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.

Quoted 5 lines
Cc Paul Mackerras <[email protected]>
Cc Stephen Rothwell <[email protected]>
Cc Roel Kluin <[email protected]>
Cc Benjamin Herrenschmidt <[email protected]>
Signature · 3 lines
Cheers,
Stephen Rothwell                    [email protected]
http://www.canb.auug.org.au/~sfr/
#2 lore raw
Quoted 10 lines · Stephen Rothwell
Quoted 9 lines · On Mon, 4 May 2009 12:58:01 -0700 Greg Kroah-Hartman <[email protected]> wrote:

From: Greg Kroah-Hartman <[email protected]>

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.

Quoted 7 lines
Quoted 5 lines
Cc Paul Mackerras <[email protected]>
Cc Stephen Rothwell <[email protected]>
Cc Roel Kluin <[email protected]>
Cc Benjamin Herrenschmidt <[email protected]>

Thanks, I've added this to the patch in my tree.

greg k-h