mirror of https://gitee.com/openkylin/linux.git
sony-laptop: Eliminate BKL in ioctls
Signed-off-by: Alan Cox <alan@redhat.com> Signed-off-by: Mattia Dongili <malattia@linux.it> Signed-off-by: Len Brown <len.brown@intel.com>
This commit is contained in:
parent
1cae710321
commit
2b24ef093a
|
@ -2224,8 +2224,8 @@ static int ec_read16(u8 addr, u16 *value)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int sonypi_misc_ioctl(struct inode *ip, struct file *fp,
|
static long sonypi_misc_ioctl(struct file *fp, unsigned int cmd,
|
||||||
unsigned int cmd, unsigned long arg)
|
unsigned long arg)
|
||||||
{
|
{
|
||||||
int ret = 0;
|
int ret = 0;
|
||||||
void __user *argp = (void __user *)arg;
|
void __user *argp = (void __user *)arg;
|
||||||
|
@ -2359,7 +2359,7 @@ static const struct file_operations sonypi_misc_fops = {
|
||||||
.open = sonypi_misc_open,
|
.open = sonypi_misc_open,
|
||||||
.release = sonypi_misc_release,
|
.release = sonypi_misc_release,
|
||||||
.fasync = sonypi_misc_fasync,
|
.fasync = sonypi_misc_fasync,
|
||||||
.ioctl = sonypi_misc_ioctl,
|
.unlocked_ioctl = sonypi_misc_ioctl,
|
||||||
};
|
};
|
||||||
|
|
||||||
static struct miscdevice sonypi_misc_device = {
|
static struct miscdevice sonypi_misc_device = {
|
||||||
|
|
Loading…
Reference in New Issue