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

Commit c0b79a90 authored by Yong Zhang's avatar Yong Zhang Committed by Richard Weinberger
Browse files

um: irq: Remove IRQF_DISABLED 



Since commit [e58aa3d2: genirq: Run irq handlers with interrupts disabled],
We run all interrupt handlers with interrupts disabled
and we even check and yell when an interrupt handler
returns with interrupts enabled (see commit [b738a50a:
genirq: Warn when handler enables interrupts]).

So now this flag is a NOOP and can be removed.

Signed-off-by: default avatarYong Zhang <yong.zhang0@gmail.com>
Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
parent c16fa4f2

arch/um/drivers/line.c

+4 −4
Original line number Diff line number Diff line
@@ -347,8 +347,8 @@ static irqreturn_t line_write_interrupt(int irq, void *data) 
	int err;



	/*

	 * Interrupts are disabled here because we registered the interrupt with

	 * IRQF_DISABLED (see line_setup_irq).

	 * Interrupts are disabled here because genirq keep irqs disabled when

	 * calling the action handler.

	 */



	spin_lock(&line->lock);
@@ -371,7 +371,7 @@ static irqreturn_t line_write_interrupt(int irq, void *data) 
int line_setup_irq(int fd, int input, int output, struct line *line, void *data)

{

	const struct line_driver *driver = line->driver;

	int err = 0, flags = IRQF_DISABLED | IRQF_SHARED | IRQF_SAMPLE_RANDOM;

	int err = 0, flags = IRQF_SHARED | IRQF_SAMPLE_RANDOM;



	if (input)

		err = um_request_irq(driver->read_irq, fd, IRQ_READ,
@@ -807,7 +807,7 @@ void register_winch_irq(int fd, int tty_fd, int pid, struct tty_struct *tty, 
				   .stack	= stack });



	if (um_request_irq(WINCH_IRQ, fd, IRQ_READ, winch_interrupt,

			   IRQF_DISABLED | IRQF_SHARED | IRQF_SAMPLE_RANDOM,

			   IRQF_SHARED | IRQF_SAMPLE_RANDOM,

			   "winch", winch) < 0) {

		printk(KERN_ERR "register_winch_irq - failed to register "

		       "IRQ\n");

arch/um/drivers/mconsole_kern.c

+1 −1
Original line number Diff line number Diff line
@@ -773,7 +773,7 @@ static int __init mconsole_init(void) 
	register_reboot_notifier(&reboot_notifier);



	err = um_request_irq(MCONSOLE_IRQ, sock, IRQ_READ, mconsole_interrupt,

			     IRQF_DISABLED | IRQF_SHARED | IRQF_SAMPLE_RANDOM,

			     IRQF_SHARED | IRQF_SAMPLE_RANDOM,

			     "mconsole", (void *)sock);

	if (err) {

		printk(KERN_ERR "Failed to get IRQ for management console\n");

arch/um/drivers/net_kern.c

+1 −1
Original line number Diff line number Diff line
@@ -161,7 +161,7 @@ static int uml_net_open(struct net_device *dev) 
	}



	err = um_request_irq(dev->irq, lp->fd, IRQ_READ, uml_net_interrupt,

			     IRQF_DISABLED | IRQF_SHARED, dev->name, dev);

			     IRQF_SHARED, dev->name, dev);

	if (err != 0) {

		printk(KERN_ERR "uml_net_open: failed to get irq(%d)\n", err);

		err = -ENETUNREACH;

arch/um/drivers/port_kern.c

+2 −2
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ static int port_accept(struct port_list *port) 
		  .port 	= port });



	if (um_request_irq(TELNETD_IRQ, socket[0], IRQ_READ, pipe_interrupt,

			  IRQF_DISABLED | IRQF_SHARED | IRQF_SAMPLE_RANDOM,

			  IRQF_SHARED | IRQF_SAMPLE_RANDOM,

			  "telnetd", conn)) {

		printk(KERN_ERR "port_accept : failed to get IRQ for "

		       "telnetd\n");
@@ -184,7 +184,7 @@ void *port_data(int port_num) 
	}



	if (um_request_irq(ACCEPT_IRQ, fd, IRQ_READ, port_interrupt,

			  IRQF_DISABLED | IRQF_SHARED | IRQF_SAMPLE_RANDOM,

			  IRQF_SHARED | IRQF_SAMPLE_RANDOM,

			  "port", port)) {

		printk(KERN_ERR "Failed to get IRQ for port %d\n", port_num);

		goto out_close;

arch/um/drivers/random.c

+1 −1
Original line number Diff line number Diff line
@@ -131,7 +131,7 @@ static int __init rng_init (void) 
	random_fd = err;



	err = um_request_irq(RANDOM_IRQ, random_fd, IRQ_READ, random_interrupt,

			     IRQF_DISABLED | IRQF_SAMPLE_RANDOM, "random",

			     IRQF_SAMPLE_RANDOM, "random",

			     NULL);

	if (err)

		goto err_out_cleanup_hw;