Commit a5f2c3c4 authored by James Bottomley's avatar James Bottomley

SCSI: fix compat_ioctl compile warnings

Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
parent 7e8c19ef
......@@ -514,10 +514,10 @@ static long aac_compat_do_ioctl(struct aac_dev *dev, unsigned cmd, unsigned long
return ret;
}
static long aac_compat_ioctl(struct scsi_device *sdev, int cmd, void __user *arg)
static int aac_compat_ioctl(struct scsi_device *sdev, int cmd, void __user *arg)
{
struct aac_dev *dev = (struct aac_dev *)sdev->host->hostdata;
return aac_compat_do_ioctl(dev, cmd, arg);
return aac_compat_do_ioctl(dev, cmd, (unsigned long)arg);
}
static long aac_compat_cfg_ioctl(struct file *file, unsigned cmd, unsigned long arg)
......
......@@ -5129,7 +5129,7 @@ static long osst_compat_ioctl(struct file * file, unsigned int cmd_in, unsigned
int ret = -ENOIOCTLCMD;
if (sdev->host->hostt->compat_ioctl) {
ret = sdev->host->hostt->compat_ioctl(sdev, cmd_in, arg);
ret = sdev->host->hostt->compat_ioctl(sdev, cmd_in, (void __user *)arg);
}
return ret;
......
......@@ -3427,14 +3427,14 @@ static int st_ioctl(struct inode *inode, struct file *file,
}
#ifdef CONFIG_COMPAT
static int st_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
static long st_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
{
struct scsi_tape *STp = file->private_data;
struct scsi_device *sdev = STp->device;
int ret = -ENOIOCTLCMD;
if (sdev->host->hostt->compat_ioctl) {
ret = sdev->host->hostt->compat_ioctl(sdev, cmd, arg);
ret = sdev->host->hostt->compat_ioctl(sdev, cmd, (void __user *)arg);
}
return ret;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment