aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/block
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
parenta625c998e638c5648600828ca1cc282d97c7ebfd (diff)
[PATCH] switch DAC960
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'drivers/block')
-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)
72 } 72 }
73} 73}
74 74
75static int DAC960_open(struct inode *inode, struct file *file) 75static int DAC960_open(struct block_device *bdev, fmode_t mode)
76{ 76{
77 struct gendisk *disk = inode->i_bdev->bd_disk; 77 struct gendisk *disk = bdev->bd_disk;
78 DAC960_Controller_T *p = disk->queue->queuedata; 78 DAC960_Controller_T *p = disk->queue->queuedata;
79 int drive_nr = (long)disk->private_data; 79 int drive_nr = (long)disk->private_data;
80 80
@@ -89,7 +89,7 @@ static int DAC960_open(struct inode *inode, struct file *file)
89 return -ENXIO; 89 return -ENXIO;
90 } 90 }
91 91
92 check_disk_change(inode->i_bdev); 92 check_disk_change(bdev);
93 93
94 if (!get_capacity(p->disks[drive_nr])) 94 if (!get_capacity(p->disks[drive_nr]))
95 return -ENXIO; 95 return -ENXIO;
@@ -153,7 +153,7 @@ static int DAC960_revalidate_disk(struct gendisk *disk)
153 153
154static struct block_device_operations DAC960_BlockDeviceOperations = { 154static struct block_device_operations DAC960_BlockDeviceOperations = {
155 .owner = THIS_MODULE, 155 .owner = THIS_MODULE,
156 .__open = DAC960_open, 156 .open = DAC960_open,
157 .getgeo = DAC960_getgeo, 157 .getgeo = DAC960_getgeo,
158 .media_changed = DAC960_media_changed, 158 .media_changed = DAC960_media_changed,
159 .revalidate_disk = DAC960_revalidate_disk, 159 .revalidate_disk = DAC960_revalidate_disk,