mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-05 00:20:32 +00:00
[PATCH] lose the unused file argument in generic_ide_ioctl()
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
parent
74f3c8aff3
commit
1bddd9e645
7 changed files with 7 additions and 9 deletions
|
@ -2174,7 +2174,7 @@ static int idecd_ioctl(struct inode *inode, struct file *file,
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
err = generic_ide_ioctl(info->drive, file, bdev, cmd, arg);
|
err = generic_ide_ioctl(info->drive, bdev, cmd, arg);
|
||||||
if (err == -EINVAL)
|
if (err == -EINVAL)
|
||||||
err = cdrom_ioctl(file, &info->devinfo, inode, cmd, arg);
|
err = cdrom_ioctl(file, &info->devinfo, inode, cmd, arg);
|
||||||
|
|
||||||
|
|
|
@ -23,5 +23,5 @@ int ide_disk_ioctl(ide_drive_t *drive, struct inode *inode, struct file *file,
|
||||||
if (err != -EOPNOTSUPP)
|
if (err != -EOPNOTSUPP)
|
||||||
return err;
|
return err;
|
||||||
|
|
||||||
return generic_ide_ioctl(drive, file, bdev, cmd, arg);
|
return generic_ide_ioctl(drive, bdev, cmd, arg);
|
||||||
}
|
}
|
||||||
|
|
|
@ -284,7 +284,7 @@ int ide_floppy_ioctl(ide_drive_t *drive, struct inode *inode,
|
||||||
file ? file->f_mode : 0, cmd, argp);
|
file ? file->f_mode : 0, cmd, argp);
|
||||||
|
|
||||||
if (err == -ENOTTY)
|
if (err == -ENOTTY)
|
||||||
err = generic_ide_ioctl(drive, file, bdev, cmd, arg);
|
err = generic_ide_ioctl(drive, bdev, cmd, arg);
|
||||||
|
|
||||||
return err;
|
return err;
|
||||||
}
|
}
|
||||||
|
|
|
@ -240,8 +240,7 @@ static int generic_drive_reset(ide_drive_t *drive)
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
int generic_ide_ioctl(ide_drive_t *drive, struct file *file,
|
int generic_ide_ioctl(ide_drive_t *drive, struct block_device *bdev,
|
||||||
struct block_device *bdev,
|
|
||||||
unsigned int cmd, unsigned long arg)
|
unsigned int cmd, unsigned long arg)
|
||||||
{
|
{
|
||||||
int err;
|
int err;
|
||||||
|
|
|
@ -2368,7 +2368,7 @@ static int idetape_ioctl(struct inode *inode, struct file *file,
|
||||||
struct block_device *bdev = inode->i_bdev;
|
struct block_device *bdev = inode->i_bdev;
|
||||||
struct ide_tape_obj *tape = ide_drv_g(bdev->bd_disk, ide_tape_obj);
|
struct ide_tape_obj *tape = ide_drv_g(bdev->bd_disk, ide_tape_obj);
|
||||||
ide_drive_t *drive = tape->drive;
|
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)
|
if (err == -EINVAL)
|
||||||
err = idetape_blkdev_ioctl(drive, cmd, arg);
|
err = idetape_blkdev_ioctl(drive, cmd, arg);
|
||||||
return err;
|
return err;
|
||||||
|
|
|
@ -478,7 +478,7 @@ static int idescsi_ide_ioctl(struct inode *inode, struct file *file,
|
||||||
{
|
{
|
||||||
struct block_device *bdev = inode->i_bdev;
|
struct block_device *bdev = inode->i_bdev;
|
||||||
struct ide_scsi_obj *scsi = ide_scsi_g(bdev->bd_disk);
|
struct ide_scsi_obj *scsi = ide_scsi_g(bdev->bd_disk);
|
||||||
return generic_ide_ioctl(scsi->drive, file, bdev, cmd, arg);
|
return generic_ide_ioctl(scsi->drive, bdev, cmd, arg);
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct block_device_operations idescsi_ops = {
|
static struct block_device_operations idescsi_ops = {
|
||||||
|
|
|
@ -1158,8 +1158,7 @@ struct ide_ioctl_devset {
|
||||||
int ide_setting_ioctl(ide_drive_t *, struct block_device *, unsigned int,
|
int ide_setting_ioctl(ide_drive_t *, struct block_device *, unsigned int,
|
||||||
unsigned long, const struct ide_ioctl_devset *);
|
unsigned long, const struct ide_ioctl_devset *);
|
||||||
|
|
||||||
int generic_ide_ioctl(ide_drive_t *, struct file *, struct block_device *,
|
int generic_ide_ioctl(ide_drive_t *, struct block_device *, unsigned, unsigned long);
|
||||||
unsigned, unsigned long);
|
|
||||||
|
|
||||||
extern int ide_vlb_clk;
|
extern int ide_vlb_clk;
|
||||||
extern int ide_pci_clk;
|
extern int ide_pci_clk;
|
||||||
|
|
Loading…
Reference in a new issue