Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 961846ca authored by Al Viro's avatar Al Viro
Browse files

[PATCH] switch xd 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 4e109852

drivers/block/xd.c

+2 −2
Original line number Diff line number Diff line
@@ -132,7 +132,7 @@ static int xd_getgeo(struct block_device *bdev, struct hd_geometry *geo); 


static struct block_device_operations xd_fops = {

	.owner	= THIS_MODULE,

	.__ioctl	= xd_ioctl,

	.locked_ioctl	= xd_ioctl,

	.getgeo = xd_getgeo,

};

static DECLARE_WAIT_QUEUE_HEAD(xd_wait_int);
@@ -343,7 +343,7 @@ static int xd_getgeo(struct block_device *bdev, struct hd_geometry *geo) 
}



/* xd_ioctl: handle device ioctl's */

static int xd_ioctl (struct inode *inode,struct file *file,u_int cmd,u_long arg)

static int xd_ioctl(struct block_device *bdev, fmode_t mode, u_int cmd, u_long arg)

{

	switch (cmd) {

		case HDIO_SET_DMA:

drivers/block/xd.h

+1 −1
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ static u_char xd_detect (u_char *controller, unsigned int *address); 
static u_char xd_initdrives (void (*init_drive)(u_char drive));



static void do_xd_request (struct request_queue * q);

static int xd_ioctl (struct inode *inode,struct file *file,unsigned int cmd,unsigned long arg);

static int xd_ioctl (struct block_device *bdev,fmode_t mode,unsigned int cmd,unsigned long arg);

static int xd_readwrite (u_char operation,XD_INFO *disk,char *buffer,u_int block,u_int count);

static void xd_recalibrate (u_char drive);