From a60ed909fc532c90512bea040e0fc146a96ae8e4 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 4 May 2009 12:40:54 -0700 Subject: [PATCH] --- yaml --- r: 151280 b: refs/heads/master c: 317ccc4246bf205807c4d2f270d7fc8f024a9dc3 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/char/hvcs.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index b7736d7f2ed1..3091ec7d2e10 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a1b4b12b372e76d22d4f3bf58b47e4cf2fb132fe +refs/heads/master: 317ccc4246bf205807c4d2f270d7fc8f024a9dc3 diff --git a/trunk/drivers/char/hvcs.c b/trunk/drivers/char/hvcs.c index c76bccf5354d..7d64e4230e66 100644 --- a/trunk/drivers/char/hvcs.c +++ b/trunk/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( 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;