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

Commit 236b8756 authored by Alan Cox's avatar Alan Cox Committed by Linus Torvalds
Browse files

dsp56k: BKL pushdown 



Push the BKL down into the driver ioctl methods

Signed-off-by: default avatarAlan Cox <alan@redhat.com>
Cc: Jiri Slaby <jirislaby@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent b8e35919

drivers/char/dsp56k.c

+14 −6
Original line number Diff line number Diff line
@@ -36,10 +36,10 @@ 
#include <linux/smp_lock.h>

#include <linux/firmware.h>

#include <linux/platform_device.h>

#include <linux/uaccess.h>	/* For put_user and get_user */



#include <asm/atarihw.h>

#include <asm/traps.h>

#include <asm/uaccess.h>	/* For put_user and get_user */



#include <asm/dsp56k.h>
@@ -303,8 +303,8 @@ static ssize_t dsp56k_write(struct file *file, const char __user *buf, size_t co 
	}

}



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

			unsigned int cmd, unsigned long arg)

static long dsp56k_ioctl(struct file *file, unsigned int cmd,

							unsigned long arg)

{

	int dev = iminor(inode) & 0x0f;

	void __user *argp = (void __user *)arg;
@@ -331,8 +331,9 @@ static int dsp56k_ioctl(struct inode *inode, struct file *file, 
			if (len > DSP56K_MAX_BINARY_LENGTH) {

				return -EINVAL;

			}

    

			lock_kernel();

			r = dsp56k_upload(bin, len);

			unlock_kernel();

			if (r < 0) {

				return r;

			}
@@ -342,12 +343,16 @@ static int dsp56k_ioctl(struct inode *inode, struct file *file, 
		case DSP56K_SET_TX_WSIZE:

			if (arg > 4 || arg < 1)

				return -EINVAL;

			lock_kernel();

			dsp56k.tx_wsize = (int) arg;

			unlock_kernel();

			break;

		case DSP56K_SET_RX_WSIZE:

			if (arg > 4 || arg < 1)

				return -EINVAL;

			lock_kernel();

			dsp56k.rx_wsize = (int) arg;

			unlock_kernel();

			break;

		case DSP56K_HOST_FLAGS:

		{
@@ -359,6 +364,7 @@ static int dsp56k_ioctl(struct inode *inode, struct file *file, 
			if(get_user(out, &hf->out) < 0)

				return -EFAULT;



			lock_kernel();

			if ((dir & 0x1) && (out & 0x1))

				dsp56k_host_interface.icr |= DSP56K_ICR_HF0;

			else if (dir & 0x1)
@@ -373,14 +379,16 @@ static int dsp56k_ioctl(struct inode *inode, struct file *file, 
			if (dsp56k_host_interface.icr & DSP56K_ICR_HF1) status |= 0x2;

			if (dsp56k_host_interface.isr & DSP56K_ISR_HF2) status |= 0x4;

			if (dsp56k_host_interface.isr & DSP56K_ISR_HF3) status |= 0x8;



			unlock_kernel();

			return put_user(status, &hf->status);

		}

		case DSP56K_HOST_CMD:

			if (arg > 31 || arg < 0)

				return -EINVAL;

			lock_kernel();

			dsp56k_host_interface.cvr = (u_char)((arg & DSP56K_CVR_HV_MASK) |

							     DSP56K_CVR_HC);

			unlock_kernel();

			break;

		default:

			return -EINVAL;
@@ -472,7 +480,7 @@ static const struct file_operations dsp56k_fops = { 
	.owner		= THIS_MODULE,

	.read		= dsp56k_read,

	.write		= dsp56k_write,

	.ioctl		= dsp56k_ioctl,

	.unlocked_ioctl	= dsp56k_ioctl,

	.open		= dsp56k_open,

	.release	= dsp56k_release,

};