Merge branch 'topstar-laptop' into release

[mv-sheeva.git] / drivers / s390 / char / raw3270.c

diff --git a/drivers/s390/char/raw3270.c b/drivers/s390/char/raw3270.c
index 9047b62294d04e723f4a267249f097f88e1fe952..d6a022f55e92a81e3d241737a90d948a308ab19f 100644 (file)
--- a/drivers/s390/char/raw3270.c
+++ b/drivers/s390/char/raw3270.c
@@ -1322,7 +1322,7 @@ static int raw3270_pm_stop(struct ccw_device *cdev)
        struct raw3270_view *view;
        unsigned long flags;
 
-       rp = cdev->dev.driver_data;
+       rp = dev_get_drvdata(&cdev->dev);
        if (!rp)
                return 0;
        spin_lock_irqsave(get_ccwdev_lock(rp->cdev), flags);
@@ -1348,7 +1348,7 @@ static int raw3270_pm_start(struct ccw_device *cdev)
        struct raw3270 *rp;
        unsigned long flags;
 
-       rp = cdev->dev.driver_data;
+       rp = dev_get_drvdata(&cdev->dev);
        if (!rp)
                return 0;
        spin_lock_irqsave(get_ccwdev_lock(rp->cdev), flags);