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

Commit 5a4bc8c1 authored by Alan Cox's avatar Alan Cox Committed by Linus Torvalds
Browse files

esp: lock_kernel push down 



Push the BKL down into a few internal bits of code in this driver.

Signed-off-by: default avatarAlan Cox <alan@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 37925e05

drivers/char/esp.c

+16 −6
Original line number Diff line number Diff line
@@ -1355,6 +1355,7 @@ static int get_serial_info(struct esp_struct * info, 
{

	struct serial_struct tmp;

  

	lock_kernel();

	memset(&tmp, 0, sizeof(tmp));

	tmp.type = PORT_16550A;

	tmp.line = info->line;
@@ -1367,6 +1368,7 @@ static int get_serial_info(struct esp_struct * info, 
	tmp.closing_wait = info->closing_wait;

	tmp.custom_divisor = info->custom_divisor;

	tmp.hub6 = 0;

	unlock_kernel();

	if (copy_to_user(retinfo,&tmp,sizeof(*retinfo)))

		return -EFAULT;

	return 0;
@@ -1381,6 +1383,7 @@ static int get_esp_config(struct esp_struct * info, 
		return -EFAULT;



	memset(&tmp, 0, sizeof(tmp));

	lock_kernel();

	tmp.rx_timeout = info->config.rx_timeout;

	tmp.rx_trigger = info->config.rx_trigger;

	tmp.tx_trigger = info->config.tx_trigger;
@@ -1388,6 +1391,7 @@ static int get_esp_config(struct esp_struct * info, 
	tmp.flow_on = info->config.flow_on;

	tmp.pio_threshold = info->config.pio_threshold;

	tmp.dma_channel = (info->stat_flags & ESP_STAT_NEVER_DMA ? 0 : dma);

	unlock_kernel();



	return copy_to_user(retinfo, &tmp, sizeof(*retinfo)) ? -EFAULT : 0;

}
@@ -1766,6 +1770,7 @@ static int rs_ioctl(struct tty_struct *tty, struct file * file, 
	struct serial_icounter_struct __user *p_cuser;	/* user space */

	void __user *argp = (void __user *)arg;

	unsigned long flags;

	int ret;



	if (serial_paranoia_check(info, tty->name, "rs_ioctl"))

		return -ENODEV;
@@ -1783,7 +1788,10 @@ static int rs_ioctl(struct tty_struct *tty, struct file * file, 
		case TIOCGSERIAL:

			return get_serial_info(info, argp);

		case TIOCSSERIAL:

			return set_serial_info(info, argp);

			lock_kernel();

			ret = set_serial_info(info, argp);

			unlock_kernel();

			return ret;

		case TIOCSERCONFIG:

			/* do not reconfigure after initial configuration */

			return 0;
@@ -1858,8 +1866,10 @@ static int rs_ioctl(struct tty_struct *tty, struct file * file, 
		case TIOCGHAYESESP:

			return get_esp_config(info, argp);

		case TIOCSHAYESESP:

		return set_esp_config(info, argp);



			lock_kernel();

			ret = set_esp_config(info, argp);

			unlock_kernel();

			return ret;

		default:

			return -ENOIOCTLCMD;

		}