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

Commit d4e33fac authored by Alan Cox's avatar Alan Cox Committed by Greg Kroah-Hartman
Browse files

serial: Kill off NO_IRQ 



We transform the offenders into a test of irq <= 0 which will be ok while
the ARM people get their platform sorted. Once that is done (or in a while
if they don't do it anyway) then we will change them all to !irq checks.

For arch specific drivers that are already using NO_IRQ = 0 we just test
against zero so we don't need to re-review them later.

Signed-off-by: default avatarAlan Cox <alan@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 3afbd89c

drivers/tty/hvc/hvc_beat.c

+1 −1
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ static int __init hvc_beat_init(void) 
	if (!firmware_has_feature(FW_FEATURE_BEAT))

		return -ENODEV;



	hp = hvc_alloc(0, NO_IRQ, &hvc_beat_get_put_ops, 16);

	hp = hvc_alloc(0, 0, &hvc_beat_get_put_ops, 16);

	if (IS_ERR(hp))

		return PTR_ERR(hp);

	hvc_beat_dev = hp;

drivers/tty/hvc/hvc_rtas.c

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


	/* Allocate an hvc_struct for the console device we instantiated

	 * earlier.  Save off hp so that we can return it on exit */

	hp = hvc_alloc(hvc_rtas_cookie, NO_IRQ, &hvc_rtas_get_put_ops, 16);

	hp = hvc_alloc(hvc_rtas_cookie, 0, &hvc_rtas_get_put_ops, 16);

	if (IS_ERR(hp))

		return PTR_ERR(hp);

drivers/tty/hvc/hvc_udbg.c

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


	BUG_ON(hvc_udbg_dev);



	hp = hvc_alloc(0, NO_IRQ, &hvc_udbg_ops, 16);

	hp = hvc_alloc(0, 0, &hvc_udbg_ops, 16);

	if (IS_ERR(hp))

		return PTR_ERR(hp);

drivers/tty/hvc/hvc_xen.c

+1 −1
Original line number Diff line number Diff line
@@ -176,7 +176,7 @@ static int __init xen_hvc_init(void) 
		xencons_irq = bind_evtchn_to_irq(xen_start_info->console.domU.evtchn);

	}

	if (xencons_irq < 0)

		xencons_irq = 0; /* NO_IRQ */

		xencons_irq = 0;

	else

		irq_set_noprobe(xencons_irq);

drivers/tty/hvc/hvcs.c

+2 −2
Original line number Diff line number Diff line
@@ -1203,7 +1203,7 @@ static void hvcs_close(struct tty_struct *tty, struct file *filp) 
{

	struct hvcs_struct *hvcsd;

	unsigned long flags;

	int irq = NO_IRQ;

	int irq;



	/*

	 * Is someone trying to close the file associated with this device after
@@ -1264,7 +1264,7 @@ static void hvcs_hangup(struct tty_struct * tty) 
	struct hvcs_struct *hvcsd = tty->driver_data;

	unsigned long flags;

	int temp_open_count;

	int irq = NO_IRQ;

	int irq;



	spin_lock_irqsave(&hvcsd->lock, flags);

	/* Preserve this so that we know how many kref refs to put */