aboutsummaryrefslogtreecommitdiff
path: root/drivers/block/DAC960.c
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2008-03-02 09:18:16 -0500
committerAl Viro <viro@zeniv.linux.org.uk>2008-10-21 07:47:36 -0400
commitb564f027ad90ab11ed668984af3ae9e0a0f27359 (patch)
treef29891722234fe54481d82e20986f4c3465cbbca /drivers/block/DAC960.c
parenta625c998e638c5648600828ca1cc282d97c7ebfd (diff)
downloadlinux-linaro-stable-b564f027ad90ab11ed668984af3ae9e0a0f27359.tar.gz
[PATCH] switch DAC960
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'drivers/block/DAC960.c')
-rw-r--r--drivers/block/DAC960.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/block/DAC960.c b/drivers/block/DAC960.c
index 4b90ebfa6676..f6a337c34ac4 100644
--- a/drivers/block/DAC960.c
+++ b/drivers/block/DAC960.c
@@ -72,9 +72,9 @@ static long disk_size(DAC960_Controller_T *p, int drive_nr)
}
}
-static int DAC960_open(struct inode *inode, struct file *file)
+static int DAC960_open(struct block_device *bdev, fmode_t mode)
{
- struct gendisk *disk = inode->i_bdev->bd_disk;
+ struct gendisk *disk = bdev->bd_disk;
DAC960_Controller_T *p = disk->queue->queuedata;
int drive_nr = (long)disk->private_data;
@@ -89,7 +89,7 @@ static int DAC960_open(struct inode *inode, struct file *file)
return -ENXIO;
}
- check_disk_change(inode->i_bdev);
+ check_disk_change(bdev);
if (!get_capacity(p->disks[drive_nr]))
return -ENXIO;
@@ -153,7 +153,7 @@ static int DAC960_revalidate_disk(struct gendisk *disk)
static struct block_device_operations DAC960_BlockDeviceOperations = {
.owner = THIS_MODULE,
- .__open = DAC960_open,
+ .open = DAC960_open,
.getgeo = DAC960_getgeo,
.media_changed = DAC960_media_changed,
.revalidate_disk = DAC960_revalidate_disk,