ide: move ioctls handling to ide-ioctls.c

[linux-2.6-omap-h63xx.git] / drivers / ide / ide.c

diff --git a/drivers/ide/ide.c b/drivers/ide/ide.c
index 19181493e7227b2512f8288da63503ecc4c5a054..349d7fa7558532f4cf6f378ec92619e443b91b54 100644 (file)
--- a/drivers/ide/ide.c
+++ b/drivers/ide/ide.c
@@ -489,180 +489,6 @@ static int generic_ide_resume(struct device *dev)
        return err;
 }
 
-static int generic_drive_reset(ide_drive_t *drive)
-{
-       struct request *rq;
-       int ret = 0;
-
-       rq = blk_get_request(drive->queue, READ, __GFP_WAIT);
-       rq->cmd_type = REQ_TYPE_SPECIAL;
-       rq->cmd_len = 1;
-       rq->cmd[0] = REQ_DRIVE_RESET;
-       rq->cmd_flags |= REQ_SOFTBARRIER;
-       if (blk_execute_rq(drive->queue, NULL, rq, 1))
-               ret = rq->errors;
-       blk_put_request(rq);
-       return ret;
-}
-
-static int ide_get_identity_ioctl(ide_drive_t *drive, unsigned int cmd,
-                                 unsigned long arg)
-{
-       u16 *id = NULL;
-       int size = (cmd == HDIO_GET_IDENTITY) ? (ATA_ID_WORDS * 2) : 142;
-       int rc = 0;
-
-       if (drive->id_read == 0) {
-               rc = -ENOMSG;
-               goto out;
-       }
-
-       id = kmalloc(size, GFP_KERNEL);
-       if (id == NULL) {
-               rc = -ENOMEM;
-               goto out;
-       }
-
-       memcpy(id, drive->id, size);
-       ata_id_to_hd_driveid(id);
-
-       if (copy_to_user((void __user *)arg, id, size))
-               rc = -EFAULT;
-
-       kfree(id);
-out:
-       return rc;
-}
-
-static int ide_get_nice_ioctl(ide_drive_t *drive, unsigned long arg)
-{
-       return put_user((drive->dsc_overlap << IDE_NICE_DSC_OVERLAP) |
-                       (drive->nice1 << IDE_NICE_1), (long __user *)arg);
-}
-
-static int ide_set_nice_ioctl(ide_drive_t *drive, unsigned long arg)
-{
-       if (arg != (arg & ((1 << IDE_NICE_DSC_OVERLAP) | (1 << IDE_NICE_1))))
-               return -EPERM;
-
-       if (((arg >> IDE_NICE_DSC_OVERLAP) & 1) &&
-           (drive->media == ide_disk || drive->media == ide_floppy ||
-            drive->scsi))
-               return -EPERM;
-
-       drive->dsc_overlap = (arg >> IDE_NICE_DSC_OVERLAP) & 1;
-       drive->nice1 = (arg >> IDE_NICE_1) & 1;
-
-       return 0;
-}
-
-static const struct ide_ioctl_devset ide_ioctl_settings[] = {
-{ HDIO_GET_32BIT,       HDIO_SET_32BIT,        get_io_32bit,  set_io_32bit  },
-{ HDIO_GET_KEEPSETTINGS, HDIO_SET_KEEPSETTINGS,        get_ksettings, set_ksettings },
-{ HDIO_GET_UNMASKINTR,  HDIO_SET_UNMASKINTR,   get_unmaskirq, set_unmaskirq },
-{ HDIO_GET_DMA,                 HDIO_SET_DMA,          get_using_dma, set_using_dma },
-{ -1,                   HDIO_SET_PIO_MODE,     NULL,          set_pio_mode  },
-{ 0 }
-};
-
-int generic_ide_ioctl(ide_drive_t *drive, struct file *file,
-                     struct block_device *bdev,
-                     unsigned int cmd, unsigned long arg)
-{
-       int err;
-
-       err = ide_setting_ioctl(drive, bdev, cmd, arg, ide_ioctl_settings);
-       if (err != -EOPNOTSUPP)
-               return err;
-
-       switch (cmd) {
-       case HDIO_OBSOLETE_IDENTITY:
-       case HDIO_GET_IDENTITY:
-               if (bdev != bdev->bd_contains)
-                       return -EINVAL;
-               return ide_get_identity_ioctl(drive, cmd, arg);
-       case HDIO_GET_NICE:
-               return ide_get_nice_ioctl(drive, arg);
-       case HDIO_SET_NICE:
-               if (!capable(CAP_SYS_ADMIN))
-                       return -EACCES;
-               return ide_set_nice_ioctl(drive, arg);
-#ifdef CONFIG_IDE_TASK_IOCTL
-       case HDIO_DRIVE_TASKFILE:
-               if (!capable(CAP_SYS_ADMIN) || !capable(CAP_SYS_RAWIO))
-                       return -EACCES;
-               if (drive->media == ide_disk)
-                       return ide_taskfile_ioctl(drive, cmd, arg);
-               return -ENOMSG;
-#endif
-       case HDIO_DRIVE_CMD:
-               if (!capable(CAP_SYS_RAWIO))
-                       return -EACCES;
-               return ide_cmd_ioctl(drive, cmd, arg);
-       case HDIO_DRIVE_TASK:
-               if (!capable(CAP_SYS_RAWIO))
-                       return -EACCES;
-               return ide_task_ioctl(drive, cmd, arg);
-       case HDIO_DRIVE_RESET:
-               if (!capable(CAP_SYS_ADMIN))
-                       return -EACCES;
-               return generic_drive_reset(drive);
-       case HDIO_GET_BUSSTATE:
-               if (!capable(CAP_SYS_ADMIN))
-                       return -EACCES;
-               if (put_user(BUSSTATE_ON, (long __user *)arg))
-                       return -EFAULT;
-               return 0;
-       case HDIO_SET_BUSSTATE:
-               if (!capable(CAP_SYS_ADMIN))
-                       return -EACCES;
-               return -EOPNOTSUPP;
-       default:
-               return -EINVAL;
-       }
-}
-EXPORT_SYMBOL(generic_ide_ioctl);
-
-int ide_setting_ioctl(ide_drive_t *drive, struct block_device *bdev,
-                     unsigned int cmd, unsigned long arg,
-                     const struct ide_ioctl_devset *s)
-{
-       unsigned long flags;
-       int err = -EOPNOTSUPP;
-
-       for (; s->get_ioctl; s++) {
-               if (s->get && s->get_ioctl == cmd)
-                       goto read_val;
-               else if (s->set && s->set_ioctl == cmd)
-                       goto set_val;
-       }
-
-       return err;
-
-read_val:
-       mutex_lock(&ide_setting_mtx);
-       spin_lock_irqsave(&ide_lock, flags);
-       err = s->get(drive);
-       spin_unlock_irqrestore(&ide_lock, flags);
-       mutex_unlock(&ide_setting_mtx);
-       return err >= 0 ? put_user(err, (long __user *)arg) : err;
-
-set_val:
-       if (bdev != bdev->bd_contains)
-               err = -EINVAL;
-       else {
-               if (!capable(CAP_SYS_ADMIN))
-                       err = -EACCES;
-               else {
-                       mutex_lock(&ide_setting_mtx);
-                       err = s->set(drive, arg);
-                       mutex_unlock(&ide_setting_mtx);
-               }
-       }
-       return err;
-}
-EXPORT_SYMBOL_GPL(ide_setting_ioctl);
-
 /**
  * ide_device_get      -       get an additional reference to a ide_drive_t
  * @drive:     device to get a reference to