Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 90276a1a authored by Jesper Nilsson's avatar Jesper Nilsson
Browse files

cris: Pushdown the bkl from ioctl 



From: Frederic Weisbecker <fweisbec@gmail.com>

Pushdown the bkl to the remaining drivers using the
deprecated .ioctl.

Signed-off-by: default avatarFrederic Weisbecker <fweisbec@gmail.com>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarJesper Nilsson <jesper.nilsson@axis.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: John Kacur <jkacur@redhat.com>
parent 3648bdf7

arch/cris/arch-v10/drivers/gpio.c

+20 −10
Original line number Diff line number Diff line
@@ -46,8 +46,7 @@ static char gpio_name[] = "etrax gpio"; 
static wait_queue_head_t *gpio_wq;

#endif



static int gpio_ioctl(struct inode *inode, struct file *file,

	unsigned int cmd, unsigned long arg);

static int gpio_ioctl(struct file *file, unsigned int cmd, unsigned long arg);

static ssize_t gpio_write(struct file *file, const char __user *buf,

	size_t count, loff_t *off);

static int gpio_open(struct inode *inode, struct file *filp);
@@ -505,8 +504,7 @@ static int 
gpio_leds_ioctl(unsigned int cmd, unsigned long arg);



static int

gpio_ioctl(struct inode *inode, struct file *file,

	   unsigned int cmd, unsigned long arg)

gpio_ioctl_unlocked(struct file *file, unsigned int cmd, unsigned long arg)

{

	unsigned long flags;

	unsigned long val;
@@ -683,6 +681,18 @@ gpio_ioctl(struct inode *inode, struct file *file, 
	return ret;

}



static int

gpio_ioctl(struct file *file, unsigned int cmd, unsigned long arg)

{

       long ret;



       lock_kernel();

       ret = gpio_ioctl_unlocked(file, cmd, arg);

       unlock_kernel();



       return ret;

}



static int

gpio_leds_ioctl(unsigned int cmd, unsigned long arg)

{
@@ -715,7 +725,7 @@ gpio_leds_ioctl(unsigned int cmd, unsigned long arg) 
static const struct file_operations gpio_fops = {

	.owner          = THIS_MODULE,

	.poll           = gpio_poll,

	.ioctl       = gpio_ioctl,

	.unlocked_ioctl = gpio_ioctl,

	.write          = gpio_write,

	.open           = gpio_open,

	.release        = gpio_release,

arch/cris/arch-v10/drivers/i2c.c

+16 −6
Original line number Diff line number Diff line
@@ -580,8 +580,7 @@ i2c_release(struct inode *inode, struct file *filp) 
 */



static int

i2c_ioctl(struct inode *inode, struct file *file,

	  unsigned int cmd, unsigned long arg)

i2c_ioctl_unlocked(struct file *file, unsigned int cmd, unsigned long arg)

{

	if(_IOC_TYPE(cmd) != ETRAXI2C_IOCTYPE) {

		return -EINVAL;
@@ -617,9 +616,20 @@ i2c_ioctl(struct inode *inode, struct file *file, 
	return 0;

}



static long i2c_ioctl(struct file *file, unsigned int cmd, unsigned long arg)

{

	long ret;



	lock_kernel();

	ret = i2c_ioctl_unlocked(file, cmd, arg);

	unlock_kernel();



	return ret;

}



static const struct file_operations i2c_fops = {

	.owner		= THIS_MODULE,

	.ioctl    = i2c_ioctl,

	.unlocked_ioctl	= i2c_ioctl,

	.open		= i2c_open,

	.release	= i2c_release,

};

arch/cris/arch-v10/drivers/sync_serial.c

+21 −9
Original line number Diff line number Diff line
@@ -157,7 +157,7 @@ static int sync_serial_open(struct inode *inode, struct file *file); 
static int sync_serial_release(struct inode *inode, struct file *file);

static unsigned int sync_serial_poll(struct file *filp, poll_table *wait);



static int sync_serial_ioctl(struct inode *inode, struct file *file,

static int sync_serial_ioctl(struct file *file,

	unsigned int cmd, unsigned long arg);

static ssize_t sync_serial_write(struct file *file, const char *buf,

	size_t count, loff_t *ppos);
@@ -248,7 +248,7 @@ static const struct file_operations sync_serial_fops = { 
	.write		= sync_serial_write,

	.read		= sync_serial_read,

	.poll		= sync_serial_poll,

	.ioctl   = sync_serial_ioctl,

	.unlocked_ioctl	= sync_serial_ioctl,

	.open		= sync_serial_open,

	.release	= sync_serial_release

};
@@ -678,7 +678,7 @@ static unsigned int sync_serial_poll(struct file *file, poll_table *wait) 
	return mask;

}



static int sync_serial_ioctl(struct inode *inode, struct file *file,

static int sync_serial_ioctl_unlocked(struct file *file,

		  unsigned int cmd, unsigned long arg)

{

	int return_val = 0;
@@ -956,6 +956,18 @@ static int sync_serial_ioctl(struct inode *inode, struct file *file, 
	return return_val;

}



static long sync_serial_ioctl(struct file *file,

			      unsigned int cmd, unsigned long arg)

{

	long ret;



	lock_kernel();

	ret = sync_serial_ioctl_unlocked(file, cmd, arg);

	unlock_kernel();



	return ret;

}





static ssize_t sync_serial_write(struct file *file, const char *buf,

	size_t count, loff_t *ppos)

arch/cris/arch-v32/drivers/cryptocop.c

+20 −6
Original line number Diff line number Diff line
@@ -217,7 +217,7 @@ static int cryptocop_open(struct inode *, struct file *); 


static int cryptocop_release(struct inode *, struct file *);



static int cryptocop_ioctl(struct inode *inode, struct file *file,

static long cryptocop_ioctl(struct file *file,

			   unsigned int cmd, unsigned long arg);



static void cryptocop_start_job(void);
@@ -282,7 +282,7 @@ const struct file_operations cryptocop_fops = { 
	.owner		= THIS_MODULE,

	.open		= cryptocop_open,

	.release	= cryptocop_release,

	.ioctl =	cryptocop_ioctl

	.unlocked_ioctl = cryptocop_ioctl

};
@@ -3102,7 +3102,8 @@ static int cryptocop_ioctl_create_session(struct inode *inode, struct file *filp 
	return 0;

}



static int cryptocop_ioctl(struct inode *inode, struct file *filp, unsigned int cmd, unsigned long arg)

static long cryptocop_ioctl_unlocked(struct inode *inode,

	struct file *filp, unsigned int cmd, unsigned long arg)

{

	int err = 0;

	if (_IOC_TYPE(cmd) != ETRAXCRYPTOCOP_IOCTYPE) {
@@ -3134,6 +3135,19 @@ static int cryptocop_ioctl(struct inode *inode, struct file *filp, unsigned int 
	return 0;

}



static long

cryptocop_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)

{

       struct inode *inode = file->f_path.dentry->d_inode;

       long ret;



       lock_kernel();

       ret = cryptocop_ioctl_unlocked(inode, filp, cmd, arg);

       unlock_kernel();



       return ret;

}





#ifdef LDEBUG

static void print_dma_descriptors(struct cryptocop_int_operation *iop)

arch/cris/arch-v32/drivers/mach-a3/gpio.c

+19 −9
Original line number Diff line number Diff line
@@ -72,8 +72,7 @@ static char gpio_name[] = "etrax gpio"; 
static int virtual_gpio_ioctl(struct file *file, unsigned int cmd,

			      unsigned long arg);

#endif

static int gpio_ioctl(struct inode *inode, struct file *file,

	unsigned int cmd, unsigned long arg);

static long gpio_ioctl(struct file *file, unsigned int cmd, unsigned long arg);

static ssize_t gpio_write(struct file *file, const char __user *buf,

	size_t count, loff_t *off);

static int gpio_open(struct inode *inode, struct file *filp);
@@ -521,7 +520,7 @@ static inline unsigned long setget_output(struct gpio_private *priv, 
	return dir_shadow;

} /* setget_output */



static int gpio_ioctl(struct inode *inode, struct file *file,

static long gpio_ioctl_unlocked(struct file *file,

	unsigned int cmd, unsigned long arg)

{

	unsigned long flags;
@@ -664,6 +663,17 @@ static int gpio_ioctl(struct inode *inode, struct file *file, 
	return 0;

}



static long gpio_ioctl(struct file *file, unsigned int cmd, unsigned long arg)

{

       long ret;



       lock_kernel();

       ret = gpio_ioctl_unlocked(file, cmd, arg);

       unlock_kernel();



       return ret;

}



#ifdef CONFIG_ETRAX_VIRTUAL_GPIO

static int virtual_gpio_ioctl(struct file *file, unsigned int cmd,

	unsigned long arg)
@@ -879,7 +889,7 @@ static int gpio_pwm_ioctl(struct gpio_private *priv, unsigned int cmd, 
static const struct file_operations gpio_fops = {

	.owner		= THIS_MODULE,

	.poll		= gpio_poll,

	.ioctl       = gpio_ioctl,

	.unlocked_ioctl	= gpio_ioctl,

	.write		= gpio_write,

	.open		= gpio_open,

	.release	= gpio_release,