diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2014-05-07 11:44:15 -0400 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2014-05-16 08:05:20 -0400 |
commit | 651fb13943304be2008b43adf813fa62435423d7 (patch) | |
tree | a82ab977593190710e848535fb376a831c9e3b4f | |
parent | 094e873c2a0bd54ced4e98f1f6f612b1fc60f426 (diff) |
tile: serial: Use irq_alloc/free_hwirq
No functional change. Just convert to the new interface.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: Grant Likely <grant.likely@linaro.org>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Acked-by: Chris Metcalf <cmetcalf@tilera.com>
Link: http://lkml.kernel.org/r/20140507154337.643399187@linutronix.de
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
-rw-r--r-- | drivers/tty/serial/tilegx.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/tty/serial/tilegx.c b/drivers/tty/serial/tilegx.c index f92d7e6bd876..613ccf09dc2a 100644 --- a/drivers/tty/serial/tilegx.c +++ b/drivers/tty/serial/tilegx.c | |||
@@ -359,8 +359,8 @@ static int tilegx_startup(struct uart_port *port) | |||
359 | } | 359 | } |
360 | 360 | ||
361 | /* Create our IRQs. */ | 361 | /* Create our IRQs. */ |
362 | port->irq = create_irq(); | 362 | port->irq = irq_alloc_hwirq(-1); |
363 | if (port->irq < 0) | 363 | if (!port->irq) |
364 | goto err_uart_dest; | 364 | goto err_uart_dest; |
365 | tile_irq_activate(port->irq, TILE_IRQ_PERCPU); | 365 | tile_irq_activate(port->irq, TILE_IRQ_PERCPU); |
366 | 366 | ||
@@ -395,7 +395,7 @@ static int tilegx_startup(struct uart_port *port) | |||
395 | err_free_irq: | 395 | err_free_irq: |
396 | free_irq(port->irq, port); | 396 | free_irq(port->irq, port); |
397 | err_dest_irq: | 397 | err_dest_irq: |
398 | destroy_irq(port->irq); | 398 | irq_free_hwirq(port->irq); |
399 | err_uart_dest: | 399 | err_uart_dest: |
400 | gxio_uart_destroy(context); | 400 | gxio_uart_destroy(context); |
401 | ret = -ENXIO; | 401 | ret = -ENXIO; |
@@ -435,7 +435,7 @@ static void tilegx_shutdown(struct uart_port *port) | |||
435 | 435 | ||
436 | if (port->irq > 0) { | 436 | if (port->irq > 0) { |
437 | free_irq(port->irq, port); | 437 | free_irq(port->irq, port); |
438 | destroy_irq(port->irq); | 438 | irq_free_hwirq(port->irq); |
439 | port->irq = 0; | 439 | port->irq = 0; |
440 | } | 440 | } |
441 | 441 | ||