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

Commit 1bddd9e6 authored by Al Viro's avatar Al Viro
Browse files

[PATCH] lose the unused file argument in generic_ide_ioctl() 



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

drivers/ide/ide-cd.c

+1 −1
Original line number Diff line number Diff line
@@ -2174,7 +2174,7 @@ static int idecd_ioctl(struct inode *inode, struct file *file, 
		break;

	}



	err = generic_ide_ioctl(info->drive, file, bdev, cmd, arg);

	err = generic_ide_ioctl(info->drive, bdev, cmd, arg);

	if (err == -EINVAL)

		err = cdrom_ioctl(file, &info->devinfo, inode, cmd, arg);

drivers/ide/ide-disk_ioctl.c

+1 −1
Original line number Diff line number Diff line
@@ -23,5 +23,5 @@ int ide_disk_ioctl(ide_drive_t *drive, struct inode *inode, struct file *file, 
	if (err != -EOPNOTSUPP)

		return err;



	return generic_ide_ioctl(drive, file, bdev, cmd, arg);

	return generic_ide_ioctl(drive, bdev, cmd, arg);

}

drivers/ide/ide-floppy_ioctl.c

+1 −1
Original line number Diff line number Diff line
@@ -284,7 +284,7 @@ int ide_floppy_ioctl(ide_drive_t *drive, struct inode *inode, 
				file ? file->f_mode : 0, cmd, argp);



	if (err == -ENOTTY)

		err = generic_ide_ioctl(drive, file, bdev, cmd, arg);

		err = generic_ide_ioctl(drive, bdev, cmd, arg);



	return err;

}

drivers/ide/ide-ioctls.c

+1 −2
Original line number Diff line number Diff line
@@ -240,8 +240,7 @@ static int generic_drive_reset(ide_drive_t *drive) 
	return ret;

}



int generic_ide_ioctl(ide_drive_t *drive, struct file *file,

		      struct block_device *bdev,

int generic_ide_ioctl(ide_drive_t *drive, struct block_device *bdev,

		      unsigned int cmd, unsigned long arg)

{

	int err;

drivers/ide/ide-tape.c

+1 −1
Original line number Diff line number Diff line
@@ -2368,7 +2368,7 @@ static int idetape_ioctl(struct inode *inode, struct file *file, 
	struct block_device *bdev = inode->i_bdev;

	struct ide_tape_obj *tape = ide_drv_g(bdev->bd_disk, ide_tape_obj);

	ide_drive_t *drive = tape->drive;

	int err = generic_ide_ioctl(drive, file, bdev, cmd, arg);

	int err = generic_ide_ioctl(drive, bdev, cmd, arg);

	if (err == -EINVAL)

		err = idetape_blkdev_ioctl(drive, cmd, arg);

	return err;