diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2008-03-02 10:23:12 -0500 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2008-10-21 07:48:11 -0400 |
commit | 961846ca5aae2f39d061e057ae6ad0b54b134008 (patch) | |
tree | af98d98a32458d306da75f54411d82d4f64a8bbe | |
parent | 4e1098529816994fc1513050cd52bbe6e0dbf2cc (diff) |
[PATCH] switch xd
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
-rw-r--r-- | drivers/block/xd.c | 4 | ||||
-rw-r--r-- | drivers/block/xd.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/block/xd.c b/drivers/block/xd.c index 316fa1da4b9c..64b496fce98b 100644 --- a/drivers/block/xd.c +++ b/drivers/block/xd.c | |||
@@ -132,7 +132,7 @@ static int xd_getgeo(struct block_device *bdev, struct hd_geometry *geo); | |||
132 | 132 | ||
133 | static struct block_device_operations xd_fops = { | 133 | static struct block_device_operations xd_fops = { |
134 | .owner = THIS_MODULE, | 134 | .owner = THIS_MODULE, |
135 | .__ioctl = xd_ioctl, | 135 | .locked_ioctl = xd_ioctl, |
136 | .getgeo = xd_getgeo, | 136 | .getgeo = xd_getgeo, |
137 | }; | 137 | }; |
138 | static DECLARE_WAIT_QUEUE_HEAD(xd_wait_int); | 138 | static DECLARE_WAIT_QUEUE_HEAD(xd_wait_int); |
@@ -343,7 +343,7 @@ static int xd_getgeo(struct block_device *bdev, struct hd_geometry *geo) | |||
343 | } | 343 | } |
344 | 344 | ||
345 | /* xd_ioctl: handle device ioctl's */ | 345 | /* xd_ioctl: handle device ioctl's */ |
346 | static int xd_ioctl (struct inode *inode,struct file *file,u_int cmd,u_long arg) | 346 | static int xd_ioctl(struct block_device *bdev, fmode_t mode, u_int cmd, u_long arg) |
347 | { | 347 | { |
348 | switch (cmd) { | 348 | switch (cmd) { |
349 | case HDIO_SET_DMA: | 349 | case HDIO_SET_DMA: |
diff --git a/drivers/block/xd.h b/drivers/block/xd.h index cffd44a20383..37cacef16e93 100644 --- a/drivers/block/xd.h +++ b/drivers/block/xd.h | |||
@@ -105,7 +105,7 @@ static u_char xd_detect (u_char *controller, unsigned int *address); | |||
105 | static u_char xd_initdrives (void (*init_drive)(u_char drive)); | 105 | static u_char xd_initdrives (void (*init_drive)(u_char drive)); |
106 | 106 | ||
107 | static void do_xd_request (struct request_queue * q); | 107 | static void do_xd_request (struct request_queue * q); |
108 | static int xd_ioctl (struct inode *inode,struct file *file,unsigned int cmd,unsigned long arg); | 108 | static int xd_ioctl (struct block_device *bdev,fmode_t mode,unsigned int cmd,unsigned long arg); |
109 | static int xd_readwrite (u_char operation,XD_INFO *disk,char *buffer,u_int block,u_int count); | 109 | static int xd_readwrite (u_char operation,XD_INFO *disk,char *buffer,u_int block,u_int count); |
110 | static void xd_recalibrate (u_char drive); | 110 | static void xd_recalibrate (u_char drive); |
111 | 111 | ||