aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2014-05-07 11:44:14 -0400
committerThomas Gleixner <tglx@linutronix.de>2014-05-16 08:05:20 -0400
commit094e873c2a0bd54ced4e98f1f6f612b1fc60f426 (patch)
treeafb44a10a9036dd2e94c024ae01975d2d2867207
parent7e5f01b1a1504b2777342628e365c1a0c6600b0e (diff)
tile: net: 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.410843062@linutronix.de Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
-rw-r--r--drivers/net/ethernet/tile/tilegx.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/ethernet/tile/tilegx.c b/drivers/net/ethernet/tile/tilegx.c
index 7e1c91d41a87..449011b0e007 100644
--- a/drivers/net/ethernet/tile/tilegx.c
+++ b/drivers/net/ethernet/tile/tilegx.c
@@ -1208,8 +1208,8 @@ static int tile_net_setup_interrupts(struct net_device *dev)
1208 1208
1209 irq = md->ingress_irq; 1209 irq = md->ingress_irq;
1210 if (irq < 0) { 1210 if (irq < 0) {
1211 irq = create_irq(); 1211 irq = irq_alloc_hwirq(-1);
1212 if (irq < 0) { 1212 if (!irq) {
1213 netdev_err(dev, 1213 netdev_err(dev,
1214 "create_irq failed: mpipe[%d] %d\n", 1214 "create_irq failed: mpipe[%d] %d\n",
1215 instance, irq); 1215 instance, irq);
@@ -1223,7 +1223,7 @@ static int tile_net_setup_interrupts(struct net_device *dev)
1223 if (rc != 0) { 1223 if (rc != 0) {
1224 netdev_err(dev, "request_irq failed: mpipe[%d] %d\n", 1224 netdev_err(dev, "request_irq failed: mpipe[%d] %d\n",
1225 instance, rc); 1225 instance, rc);
1226 destroy_irq(irq); 1226 irq_free_hwirq(irq);
1227 return rc; 1227 return rc;
1228 } 1228 }
1229 md->ingress_irq = irq; 1229 md->ingress_irq = irq;