diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-06-19 10:36:30 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-06-19 10:36:30 +1000 |
| commit | c4097f84ba8a5d87c9eaf8c37f30d9b48f875a13 (patch) | |
| tree | 3a98af68906b6aa67b8d721fdf3cad7a75e4335a /drivers/s390/char/monreader.c | |
| parent | e1380e13c5c1deb86810e8ca983bcaec86bfe571 (diff) | |
| parent | 085868189cfbc20050208cad7e891db00e857e6a (diff) | |
Merge commit 's390/features'
Diffstat (limited to 'drivers/s390/char/monreader.c')
| -rw-r--r-- | drivers/s390/char/monreader.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/s390/char/monreader.c b/drivers/s390/char/monreader.c index 75a8831eebbc..7892550d7932 100644 --- a/drivers/s390/char/monreader.c +++ b/drivers/s390/char/monreader.c @@ -320,7 +320,7 @@ static int mon_open(struct inode *inode, struct file *filp) goto out_path; } filp->private_data = monpriv; - monreader_device->driver_data = monpriv; + dev_set_drvdata(&monreader_device, monpriv); unlock_kernel(); return nonseekable_open(inode, filp); @@ -463,7 +463,7 @@ static struct miscdevice mon_dev = { *****************************************************************************/ static int monreader_freeze(struct device *dev) { - struct mon_private *monpriv = dev->driver_data; + struct mon_private *monpriv = dev_get_drvdata(&dev); int rc; if (!monpriv) @@ -487,7 +487,7 @@ static int monreader_freeze(struct device *dev) static int monreader_thaw(struct device *dev) { - struct mon_private *monpriv = dev->driver_data; + struct mon_private *monpriv = dev_get_drvdata(dev); int rc; if (!monpriv) |