Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile

[linux-2.6-block.git] / drivers / tty / hvc / hvc_tile.c

diff --git a/drivers/tty/hvc/hvc_tile.c b/drivers/tty/hvc/hvc_tile.c
index af4e3d1bac2a30fc85aba9a15ceb6a801b9c0720..df374860037cd2c64efe6617b485797b11f3acf9 100644 (file)
--- a/drivers/tty/hvc/hvc_tile.c
+++ b/drivers/tty/hvc/hvc_tile.c
@@ -133,14 +133,14 @@ static int hvc_tile_probe(struct platform_device *pdev)
        int tile_hvc_irq;
 
        /* Create our IRQ and register it. */
-       tile_hvc_irq = create_irq();
-       if (tile_hvc_irq < 0)
+       tile_hvc_irq = irq_alloc_hwirq(-1);
+       if (!tile_hvc_irq)
                return -ENXIO;
 
        tile_irq_activate(tile_hvc_irq, TILE_IRQ_PERCPU);
        hp = hvc_alloc(0, tile_hvc_irq, &hvc_tile_get_put_ops, 128);
        if (IS_ERR(hp)) {
-               destroy_irq(tile_hvc_irq);
+               irq_free_hwirq(tile_hvc_irq);
                return PTR_ERR(hp);
        }
        dev_set_drvdata(&pdev->dev, hp);
@@ -155,7 +155,7 @@ static int hvc_tile_remove(struct platform_device *pdev)
 
        rc = hvc_remove(hp);
        if (rc == 0)
-               destroy_irq(hp->data);
+               irq_free_hwirq(hp->data);
 
        return rc;
 }