AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

[PATCH] Make hvc_console.c compile on non-powerpc: Remove NO_IRQ

Browse Source 
Paulus preferred this over #defining NO_IRQ in the file, since that's
0 for powerpc anyway.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Acked-by: Paul Mackerras <paulus@samba.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Rusty Russell 2007-02-23 14:12:02 +11:00 committed by Linus Torvalds
parent 62fa4dc7f7
commit 8cd0ae056a
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/char/hvc_console.c
View File

@ -316,7 +316,7 @@ static int hvc_open(struct tty_struct *tty, struct file * filp)
{ {
struct hvc_struct *hp; struct hvc_struct *hp;
unsigned long flags; unsigned long flags;
int irq = NO_IRQ; int irq = 0;
int rc = 0; int rc = 0;
struct kobject *kobjp; struct kobject *kobjp;
@ -338,14 +338,14 @@ static int hvc_open(struct tty_struct *tty, struct file * filp)
hp->tty = tty; hp->tty = tty;
/* Save for request_irq outside of spin_lock. */ /* Save for request_irq outside of spin_lock. */
irq = hp->irq; irq = hp->irq;
if (irq != NO_IRQ) if (irq)
hp->irq_requested = 1; hp->irq_requested = 1;
kobjp = &hp->kobj; kobjp = &hp->kobj;
spin_unlock_irqrestore(&hp->lock, flags); spin_unlock_irqrestore(&hp->lock, flags);
/* check error, fallback to non-irq */ /* check error, fallback to non-irq */
if (irq != NO_IRQ) if (irq)
rc = request_irq(irq, hvc_handle_interrupt, IRQF_DISABLED, "hvc_console", hp); rc = request_irq(irq, hvc_handle_interrupt, IRQF_DISABLED, "hvc_console", hp);
/* /*
@ -373,7 +373,7 @@ static void hvc_close(struct tty_struct *tty, struct file * filp)
{ {
struct hvc_struct *hp; struct hvc_struct *hp;
struct kobject *kobjp; struct kobject *kobjp;
int irq = NO_IRQ; int irq = 0;
unsigned long flags; unsigned long flags;
if (tty_hung_up_p(filp)) if (tty_hung_up_p(filp))
@ -407,7 +407,7 @@ static void hvc_close(struct tty_struct *tty, struct file * filp)
*/ */
tty_wait_until_sent(tty, HVC_CLOSE_WAIT); tty_wait_until_sent(tty, HVC_CLOSE_WAIT);
if (irq != NO_IRQ) if (irq)
free_irq(irq, hp); free_irq(irq, hp);
} else { } else {
@ -424,7 +424,7 @@ static void hvc_hangup(struct tty_struct *tty)
{ {
struct hvc_struct *hp = tty->driver_data; struct hvc_struct *hp = tty->driver_data;
unsigned long flags; unsigned long flags;
int irq = NO_IRQ; int irq = 0;
int temp_open_count; int temp_open_count;
struct kobject *kobjp; struct kobject *kobjp;
@ -453,7 +453,7 @@ static void hvc_hangup(struct tty_struct *tty)
irq = hp->irq; irq = hp->irq;
hp->irq_requested = 0; hp->irq_requested = 0;
spin_unlock_irqrestore(&hp->lock, flags); spin_unlock_irqrestore(&hp->lock, flags);
if (irq != NO_IRQ) if (irq)
free_irq(irq, hp); free_irq(irq, hp);
while(temp_open_count) { while(temp_open_count) {
--temp_open_count; --temp_open_count;
@ -583,7 +583,7 @@ static int hvc_poll(struct hvc_struct *hp)
/* If we aren't interrupt driven and aren't throttled, we always /* If we aren't interrupt driven and aren't throttled, we always
* request a reschedule * request a reschedule
*/ */
if (hp->irq == NO_IRQ) if (hp->irq == 0)
poll_mask |= HVC_POLL_READ; poll_mask |= HVC_POLL_READ;
/* Read data if any */ /* Read data if any */