Skip to content

Commit

Permalink
hvcs: remove driver_data direct access of struct device
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Greg Kroah-Hartman committed Jun 16, 2009
1 parent a1b4b12 commit 317ccc4
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions drivers/char/hvcs.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 */

Expand Down Expand Up @@ -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;

Expand Down Expand Up @@ -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;

Expand Down

0 comments on commit 317ccc4

Please sign in to comment.