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

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>

authored by Rusty Russell and committed by Linus Torvalds 8cd0ae05 62fa4dc7

+8 -8
+8 -8
drivers/char/hvc_console.c
··· 316 { 317 struct hvc_struct *hp; 318 unsigned long flags; 319 - int irq = NO_IRQ; 320 int rc = 0; 321 struct kobject *kobjp; 322 ··· 338 hp->tty = tty; 339 /* Save for request_irq outside of spin_lock. */ 340 irq = hp->irq; 341 - if (irq != NO_IRQ) 342 hp->irq_requested = 1; 343 344 kobjp = &hp->kobj; 345 346 spin_unlock_irqrestore(&hp->lock, flags); 347 /* check error, fallback to non-irq */ 348 - if (irq != NO_IRQ) 349 rc = request_irq(irq, hvc_handle_interrupt, IRQF_DISABLED, "hvc_console", hp); 350 351 /* ··· 373 { 374 struct hvc_struct *hp; 375 struct kobject *kobjp; 376 - int irq = NO_IRQ; 377 unsigned long flags; 378 379 if (tty_hung_up_p(filp)) ··· 407 */ 408 tty_wait_until_sent(tty, HVC_CLOSE_WAIT); 409 410 - if (irq != NO_IRQ) 411 free_irq(irq, hp); 412 413 } else { ··· 424 { 425 struct hvc_struct *hp = tty->driver_data; 426 unsigned long flags; 427 - int irq = NO_IRQ; 428 int temp_open_count; 429 struct kobject *kobjp; 430 ··· 453 irq = hp->irq; 454 hp->irq_requested = 0; 455 spin_unlock_irqrestore(&hp->lock, flags); 456 - if (irq != NO_IRQ) 457 free_irq(irq, hp); 458 while(temp_open_count) { 459 --temp_open_count; ··· 583 /* If we aren't interrupt driven and aren't throttled, we always 584 * request a reschedule 585 */ 586 - if (hp->irq == NO_IRQ) 587 poll_mask |= HVC_POLL_READ; 588 589 /* Read data if any */
··· 316 { 317 struct hvc_struct *hp; 318 unsigned long flags; 319 + int irq = 0; 320 int rc = 0; 321 struct kobject *kobjp; 322 ··· 338 hp->tty = tty; 339 /* Save for request_irq outside of spin_lock. */ 340 irq = hp->irq; 341 + if (irq) 342 hp->irq_requested = 1; 343 344 kobjp = &hp->kobj; 345 346 spin_unlock_irqrestore(&hp->lock, flags); 347 /* check error, fallback to non-irq */ 348 + if (irq) 349 rc = request_irq(irq, hvc_handle_interrupt, IRQF_DISABLED, "hvc_console", hp); 350 351 /* ··· 373 { 374 struct hvc_struct *hp; 375 struct kobject *kobjp; 376 + int irq = 0; 377 unsigned long flags; 378 379 if (tty_hung_up_p(filp)) ··· 407 */ 408 tty_wait_until_sent(tty, HVC_CLOSE_WAIT); 409 410 + if (irq) 411 free_irq(irq, hp); 412 413 } else { ··· 424 { 425 struct hvc_struct *hp = tty->driver_data; 426 unsigned long flags; 427 + int irq = 0; 428 int temp_open_count; 429 struct kobject *kobjp; 430 ··· 453 irq = hp->irq; 454 hp->irq_requested = 0; 455 spin_unlock_irqrestore(&hp->lock, flags); 456 + if (irq) 457 free_irq(irq, hp); 458 while(temp_open_count) { 459 --temp_open_count; ··· 583 /* If we aren't interrupt driven and aren't throttled, we always 584 * request a reschedule 585 */ 586 + if (hp->irq == 0) 587 poll_mask |= HVC_POLL_READ; 588 589 /* Read data if any */