]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
tile: net: Use irq_alloc/free_hwirq
authorThomas Gleixner <tglx@linutronix.de>
Wed, 7 May 2014 15:44:14 +0000 (15:44 +0000)
committerThomas Gleixner <tglx@linutronix.de>
Fri, 16 May 2014 12:05:20 +0000 (14:05 +0200)
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.410843062@linutronix.de
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
drivers/net/ethernet/tile/tilegx.c

index 7e1c91d41a87ff2a4e065718d4caaf84c7db8020..449011b0e007d6b798a91728eaa845e05e581305 100644 (file)
@@ -1208,8 +1208,8 @@ static int tile_net_setup_interrupts(struct net_device *dev)
 
        irq = md->ingress_irq;
        if (irq < 0) {
-               irq = create_irq();
-               if (irq < 0) {
+               irq = irq_alloc_hwirq(-1);
+               if (!irq) {
                        netdev_err(dev,
                                   "create_irq failed: mpipe[%d] %d\n",
                                   instance, irq);
@@ -1223,7 +1223,7 @@ static int tile_net_setup_interrupts(struct net_device *dev)
                if (rc != 0) {
                        netdev_err(dev, "request_irq failed: mpipe[%d] %d\n",
                                   instance, rc);
-                       destroy_irq(irq);
+                       irq_free_hwirq(irq);
                        return rc;
                }
                md->ingress_irq = irq;