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

Commit 9cfb5c05 authored by Yong Zhang's avatar Yong Zhang Committed by Greg Kroah-Hartman
Browse files

TTY: 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>
Acked-by: default avatarTobias Klauser <tklauser@distanz.ch>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 94abc56f

drivers/tty/amiserial.c

+1 −1
Original line number Diff line number Diff line
@@ -2017,7 +2017,7 @@ static int __init amiga_serial_probe(struct platform_device *pdev) 
	if (error)

		goto fail_unregister;



	error = request_irq(IRQ_AMIGA_RBF, ser_rx_int, IRQF_DISABLED,

	error = request_irq(IRQ_AMIGA_RBF, ser_rx_int, 0,

			    "serial RX", state);

	if (error)

		goto fail_free_irq;

drivers/tty/cyclades.c

+1 −1
Original line number Diff line number Diff line
@@ -3367,7 +3367,7 @@ static int __init cy_detect_isa(void) 


		/* allocate IRQ */

		if (request_irq(cy_isa_irq, cyy_interrupt,

				IRQF_DISABLED, "Cyclom-Y", &cy_card[j])) {

				0, "Cyclom-Y", &cy_card[j])) {

			printk(KERN_ERR "Cyclom-Y/ISA found at 0x%lx, but "

				"could not allocate IRQ#%d.\n",

				(unsigned long)cy_isa_address, cy_isa_irq);

drivers/tty/hvc/hvc_irq.c

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ int notifier_add_irq(struct hvc_struct *hp, int irq) 
		hp->irq_requested = 0;

		return 0;

	}

	rc = request_irq(irq, hvc_handle_interrupt, IRQF_DISABLED,

	rc = request_irq(irq, hvc_handle_interrupt, 0,

			   "hvc_console", hp);

	if (!rc)

		hp->irq_requested = 1;

drivers/tty/hvc/hvcs.c

+1 −1
Original line number Diff line number Diff line
@@ -1057,7 +1057,7 @@ static int hvcs_enable_device(struct hvcs_struct *hvcsd, uint32_t unit_address, 
	 * the conn was registered and now.

	 */

	if (!(rc = request_irq(irq, &hvcs_handle_interrupt,

				IRQF_DISABLED, "ibmhvcs", hvcsd))) {

				0, "ibmhvcs", hvcsd))) {

		/*

		 * It is possible the vty-server was removed after the irq was

		 * requested but before we have time to enable interrupts.

drivers/tty/hvc/hvsi.c

+1 −1
Original line number Diff line number Diff line
@@ -1105,7 +1105,7 @@ static int __init hvsi_init(void) 
		struct hvsi_struct *hp = &hvsi_ports[i];

		int ret = 1;



		ret = request_irq(hp->virq, hvsi_interrupt, IRQF_DISABLED, "hvsi", hp);

		ret = request_irq(hp->virq, hvsi_interrupt, 0, "hvsi", hp);

		if (ret)

			printk(KERN_ERR "HVSI: couldn't reserve irq 0x%x (error %i)\n",

				hp->virq, ret);