|
@@ -359,8 +359,8 @@ static int tilegx_startup(struct uart_port *port)
|
|
|
}
|
|
|
|
|
|
/* Create our IRQs. */
|
|
|
- port->irq = create_irq();
|
|
|
- if (port->irq < 0)
|
|
|
+ port->irq = irq_alloc_hwirq(-1);
|
|
|
+ if (!port->irq)
|
|
|
goto err_uart_dest;
|
|
|
tile_irq_activate(port->irq, TILE_IRQ_PERCPU);
|
|
|
|
|
@@ -395,7 +395,7 @@ static int tilegx_startup(struct uart_port *port)
|
|
|
err_free_irq:
|
|
|
free_irq(port->irq, port);
|
|
|
err_dest_irq:
|
|
|
- destroy_irq(port->irq);
|
|
|
+ irq_free_hwirq(port->irq);
|
|
|
err_uart_dest:
|
|
|
gxio_uart_destroy(context);
|
|
|
ret = -ENXIO;
|
|
@@ -435,7 +435,7 @@ static void tilegx_shutdown(struct uart_port *port)
|
|
|
|
|
|
if (port->irq > 0) {
|
|
|
free_irq(port->irq, port);
|
|
|
- destroy_irq(port->irq);
|
|
|
+ irq_free_hwirq(port->irq);
|
|
|
port->irq = 0;
|
|
|
}
|
|
|
|