Skip to content

Commit

Permalink
[S390] dasd: Use accessors instead of using driver_data directly.
Browse files Browse the repository at this point in the history 
Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
  • Loading branch information
Cornelia Huck authored and Martin Schwidefsky committed Dec 25, 2008
1 parent 2bf373b commit faf16aa
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions drivers/s390/block/dasd_devmap.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -561,7 +561,7 @@ dasd_create_device(struct ccw_device *cdev)
}

spin_lock_irqsave(get_ccwdev_lock(cdev), flags);
cdev->dev.driver_data = device;
dev_set_drvdata(&cdev->dev, device);
spin_unlock_irqrestore(get_ccwdev_lock(cdev), flags);

return device;
Expand Down Expand Up @@ -597,7 +597,7 @@ dasd_delete_device(struct dasd_device *device)

/* Disconnect dasd_device structure from ccw_device structure. */
spin_lock_irqsave(get_ccwdev_lock(device->cdev), flags);
device->cdev->dev.driver_data = NULL;
dev_set_drvdata(&device->cdev->dev, NULL);
spin_unlock_irqrestore(get_ccwdev_lock(device->cdev), flags);

/*
Expand Down Expand Up @@ -638,7 +638,7 @@ dasd_put_device_wake(struct dasd_device *device)
struct dasd_device *
dasd_device_from_cdev_locked(struct ccw_device *cdev)
{
struct dasd_device *device = cdev->dev.driver_data;
struct dasd_device *device = dev_get_drvdata(&cdev->dev);

if (!device)
return ERR_PTR(-ENODEV);
Expand Down

0 comments on commit faf16aa

Please sign in to comment.