aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/s390
diff options
context:
space:
mode:
authorCornelia Huck <cornelia.huck@de.ibm.com>2008-12-25 07:38:52 -0500
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2008-12-25 07:39:01 -0500
commitfaf16aa9b368d48a0efbd0920718d68ec7a72542 (patch)
tree26f674656aa987d1c15bcc43aaaf891212f7a1b4 /drivers/s390
parent2bf373b3e3691d5cb57089a3897316a1b7d5ffa7 (diff)
[S390] dasd: Use accessors instead of using driver_data directly.
Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'drivers/s390')
-rw-r--r--drivers/s390/block/dasd_devmap.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/s390/block/dasd_devmap.c b/drivers/s390/block/dasd_devmap.c
index 921443b01d16..3f4881e01cb6 100644
--- a/drivers/s390/block/dasd_devmap.c
+++ b/drivers/s390/block/dasd_devmap.c
@@ -561,7 +561,7 @@ dasd_create_device(struct ccw_device *cdev)
561 } 561 }
562 562
563 spin_lock_irqsave(get_ccwdev_lock(cdev), flags); 563 spin_lock_irqsave(get_ccwdev_lock(cdev), flags);
564 cdev->dev.driver_data = device; 564 dev_set_drvdata(&cdev->dev, device);
565 spin_unlock_irqrestore(get_ccwdev_lock(cdev), flags); 565 spin_unlock_irqrestore(get_ccwdev_lock(cdev), flags);
566 566
567 return device; 567 return device;
@@ -597,7 +597,7 @@ dasd_delete_device(struct dasd_device *device)
597 597
598 /* Disconnect dasd_device structure from ccw_device structure. */ 598 /* Disconnect dasd_device structure from ccw_device structure. */
599 spin_lock_irqsave(get_ccwdev_lock(device->cdev), flags); 599 spin_lock_irqsave(get_ccwdev_lock(device->cdev), flags);
600 device->cdev->dev.driver_data = NULL; 600 dev_set_drvdata(&device->cdev->dev, NULL);
601 spin_unlock_irqrestore(get_ccwdev_lock(device->cdev), flags); 601 spin_unlock_irqrestore(get_ccwdev_lock(device->cdev), flags);
602 602
603 /* 603 /*
@@ -638,7 +638,7 @@ dasd_put_device_wake(struct dasd_device *device)
638struct dasd_device * 638struct dasd_device *
639dasd_device_from_cdev_locked(struct ccw_device *cdev) 639dasd_device_from_cdev_locked(struct ccw_device *cdev)
640{ 640{
641 struct dasd_device *device = cdev->dev.driver_data; 641 struct dasd_device *device = dev_get_drvdata(&cdev->dev);
642 642
643 if (!device) 643 if (!device)
644 return ERR_PTR(-ENODEV); 644 return ERR_PTR(-ENODEV);