diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/ide/ide-cd.c | 2 | ||||
-rw-r--r-- | drivers/ide/ide-disk_ioctl.c | 2 | ||||
-rw-r--r-- | drivers/ide/ide-floppy_ioctl.c | 2 | ||||
-rw-r--r-- | drivers/ide/ide-ioctls.c | 3 | ||||
-rw-r--r-- | drivers/ide/ide-tape.c | 2 | ||||
-rw-r--r-- | drivers/scsi/ide-scsi.c | 2 |
6 files changed, 6 insertions, 7 deletions
diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c index 13265a8827da..cd21b34fe509 100644 --- a/drivers/ide/ide-cd.c +++ b/drivers/ide/ide-cd.c | |||
@@ -2174,7 +2174,7 @@ static int idecd_ioctl(struct inode *inode, struct file *file, | |||
2174 | break; | 2174 | break; |
2175 | } | 2175 | } |
2176 | 2176 | ||
2177 | err = generic_ide_ioctl(info->drive, file, bdev, cmd, arg); | 2177 | err = generic_ide_ioctl(info->drive, bdev, cmd, arg); |
2178 | if (err == -EINVAL) | 2178 | if (err == -EINVAL) |
2179 | err = cdrom_ioctl(file, &info->devinfo, inode, cmd, arg); | 2179 | err = cdrom_ioctl(file, &info->devinfo, inode, cmd, arg); |
2180 | 2180 | ||
diff --git a/drivers/ide/ide-disk_ioctl.c b/drivers/ide/ide-disk_ioctl.c index a49698bcf966..41832af400d6 100644 --- a/drivers/ide/ide-disk_ioctl.c +++ b/drivers/ide/ide-disk_ioctl.c | |||
@@ -23,5 +23,5 @@ int ide_disk_ioctl(ide_drive_t *drive, struct inode *inode, struct file *file, | |||
23 | if (err != -EOPNOTSUPP) | 23 | if (err != -EOPNOTSUPP) |
24 | return err; | 24 | return err; |
25 | 25 | ||
26 | return generic_ide_ioctl(drive, file, bdev, cmd, arg); | 26 | return generic_ide_ioctl(drive, bdev, cmd, arg); |
27 | } | 27 | } |
diff --git a/drivers/ide/ide-floppy_ioctl.c b/drivers/ide/ide-floppy_ioctl.c index 3c9da4ac9341..5af70a2c9ef8 100644 --- a/drivers/ide/ide-floppy_ioctl.c +++ b/drivers/ide/ide-floppy_ioctl.c | |||
@@ -284,7 +284,7 @@ int ide_floppy_ioctl(ide_drive_t *drive, struct inode *inode, | |||
284 | file ? file->f_mode : 0, cmd, argp); | 284 | file ? file->f_mode : 0, cmd, argp); |
285 | 285 | ||
286 | if (err == -ENOTTY) | 286 | if (err == -ENOTTY) |
287 | err = generic_ide_ioctl(drive, file, bdev, cmd, arg); | 287 | err = generic_ide_ioctl(drive, bdev, cmd, arg); |
288 | 288 | ||
289 | return err; | 289 | return err; |
290 | } | 290 | } |
diff --git a/drivers/ide/ide-ioctls.c b/drivers/ide/ide-ioctls.c index a90945f49792..fcde16bb53a7 100644 --- a/drivers/ide/ide-ioctls.c +++ b/drivers/ide/ide-ioctls.c | |||
@@ -240,8 +240,7 @@ static int generic_drive_reset(ide_drive_t *drive) | |||
240 | return ret; | 240 | return ret; |
241 | } | 241 | } |
242 | 242 | ||
243 | int generic_ide_ioctl(ide_drive_t *drive, struct file *file, | 243 | int generic_ide_ioctl(ide_drive_t *drive, struct block_device *bdev, |
244 | struct block_device *bdev, | ||
245 | unsigned int cmd, unsigned long arg) | 244 | unsigned int cmd, unsigned long arg) |
246 | { | 245 | { |
247 | int err; | 246 | int err; |
diff --git a/drivers/ide/ide-tape.c b/drivers/ide/ide-tape.c index b2b2e5e8d38e..2b263281ffea 100644 --- a/drivers/ide/ide-tape.c +++ b/drivers/ide/ide-tape.c | |||
@@ -2368,7 +2368,7 @@ static int idetape_ioctl(struct inode *inode, struct file *file, | |||
2368 | struct block_device *bdev = inode->i_bdev; | 2368 | struct block_device *bdev = inode->i_bdev; |
2369 | struct ide_tape_obj *tape = ide_drv_g(bdev->bd_disk, ide_tape_obj); | 2369 | struct ide_tape_obj *tape = ide_drv_g(bdev->bd_disk, ide_tape_obj); |
2370 | ide_drive_t *drive = tape->drive; | 2370 | ide_drive_t *drive = tape->drive; |
2371 | int err = generic_ide_ioctl(drive, file, bdev, cmd, arg); | 2371 | int err = generic_ide_ioctl(drive, bdev, cmd, arg); |
2372 | if (err == -EINVAL) | 2372 | if (err == -EINVAL) |
2373 | err = idetape_blkdev_ioctl(drive, cmd, arg); | 2373 | err = idetape_blkdev_ioctl(drive, cmd, arg); |
2374 | return err; | 2374 | return err; |
diff --git a/drivers/scsi/ide-scsi.c b/drivers/scsi/ide-scsi.c index afc96e844a25..5bcc04e82c28 100644 --- a/drivers/scsi/ide-scsi.c +++ b/drivers/scsi/ide-scsi.c | |||
@@ -478,7 +478,7 @@ static int idescsi_ide_ioctl(struct inode *inode, struct file *file, | |||
478 | { | 478 | { |
479 | struct block_device *bdev = inode->i_bdev; | 479 | struct block_device *bdev = inode->i_bdev; |
480 | struct ide_scsi_obj *scsi = ide_scsi_g(bdev->bd_disk); | 480 | struct ide_scsi_obj *scsi = ide_scsi_g(bdev->bd_disk); |
481 | return generic_ide_ioctl(scsi->drive, file, bdev, cmd, arg); | 481 | return generic_ide_ioctl(scsi->drive, bdev, cmd, arg); |
482 | } | 482 | } |
483 | 483 | ||
484 | static struct block_device_operations idescsi_ops = { | 484 | static struct block_device_operations idescsi_ops = { |