diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2009-05-04 15:40:54 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-06-16 00:30:27 -0400 |
commit | 317ccc4246bf205807c4d2f270d7fc8f024a9dc3 (patch) | |
tree | 4e0dc22c268843f029bb3e8d8a898a691ff1e043 /drivers/char | |
parent | a1b4b12b372e76d22d4f3bf58b47e4cf2fb132fe (diff) |
hvcs: 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.
Cc: Paul Mackerras <paulus@samba.org>
Acked-by: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Roel Kluin <roel.kluin@gmail.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/char')
-rw-r--r-- | 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 c76bccf5354d..7d64e4230e66 100644 --- a/drivers/char/hvcs.c +++ b/drivers/char/hvcs.c | |||
@@ -347,7 +347,7 @@ static void __exit hvcs_module_exit(void); | |||
347 | 347 | ||
348 | static inline struct hvcs_struct *from_vio_dev(struct vio_dev *viod) | 348 | static inline struct hvcs_struct *from_vio_dev(struct vio_dev *viod) |
349 | { | 349 | { |
350 | return viod->dev.driver_data; | 350 | return dev_get_drvdata(&viod->dev); |
351 | } | 351 | } |
352 | /* The sysfs interface for the driver and devices */ | 352 | /* The sysfs interface for the driver and devices */ |
353 | 353 | ||
@@ -785,7 +785,7 @@ static int __devinit hvcs_probe( | |||
785 | kref_init(&hvcsd->kref); | 785 | kref_init(&hvcsd->kref); |
786 | 786 | ||
787 | hvcsd->vdev = dev; | 787 | hvcsd->vdev = dev; |
788 | dev->dev.driver_data = hvcsd; | 788 | dev_set_drvdata(&dev->dev, hvcsd); |
789 | 789 | ||
790 | hvcsd->index = index; | 790 | hvcsd->index = index; |
791 | 791 | ||
@@ -831,7 +831,7 @@ static int __devinit hvcs_probe( | |||
831 | 831 | ||
832 | static int __devexit hvcs_remove(struct vio_dev *dev) | 832 | static int __devexit hvcs_remove(struct vio_dev *dev) |
833 | { | 833 | { |
834 | struct hvcs_struct *hvcsd = dev->dev.driver_data; | 834 | struct hvcs_struct *hvcsd = dev_get_drvdata(&dev->dev); |
835 | unsigned long flags; | 835 | unsigned long flags; |
836 | struct tty_struct *tty; | 836 | struct tty_struct *tty; |
837 | 837 | ||