diff options
author | Michael Opdenacker <michael.opdenacker@free-electrons.com> | 2013-09-11 23:46:11 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-09-12 23:27:09 -0400 |
commit | 46c915f84f6671600391c15bad9e8d084ed55f37 (patch) | |
tree | db9e940c5d46a6bfd1efd68e5875d1fcc4ce7608 /drivers/net/ethernet | |
parent | 63aca0f7fa4c9e098fb5b6a24798b5f060e9de08 (diff) |
ehea: remove deprecated IRQF_DISABLED
This patch proposes to remove the IRQF_DISABLED flag from
drivers/net/ethernet/ibm/ehea/ehea_main.c
It's a NOOP since 2.6.35 and it will be removed one day.
Signed-off-by: Michael Opdenacker <michael.opdenacker@free-electrons.com>
Acked-by: Thadeu Lima de Souza Cascardo <cascardo@linux.vnet.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet')
-rw-r--r-- | drivers/net/ethernet/ibm/ehea/ehea_main.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/net/ethernet/ibm/ehea/ehea_main.c b/drivers/net/ethernet/ibm/ehea/ehea_main.c index 35853b43d66e..04e0ef1d3769 100644 --- a/drivers/net/ethernet/ibm/ehea/ehea_main.c +++ b/drivers/net/ethernet/ibm/ehea/ehea_main.c | |||
@@ -1285,7 +1285,7 @@ static int ehea_reg_interrupts(struct net_device *dev) | |||
1285 | 1285 | ||
1286 | ret = ibmebus_request_irq(port->qp_eq->attr.ist1, | 1286 | ret = ibmebus_request_irq(port->qp_eq->attr.ist1, |
1287 | ehea_qp_aff_irq_handler, | 1287 | ehea_qp_aff_irq_handler, |
1288 | IRQF_DISABLED, port->int_aff_name, port); | 1288 | 0, port->int_aff_name, port); |
1289 | if (ret) { | 1289 | if (ret) { |
1290 | netdev_err(dev, "failed registering irq for qp_aff_irq_handler:ist=%X\n", | 1290 | netdev_err(dev, "failed registering irq for qp_aff_irq_handler:ist=%X\n", |
1291 | port->qp_eq->attr.ist1); | 1291 | port->qp_eq->attr.ist1); |
@@ -1303,8 +1303,7 @@ static int ehea_reg_interrupts(struct net_device *dev) | |||
1303 | "%s-queue%d", dev->name, i); | 1303 | "%s-queue%d", dev->name, i); |
1304 | ret = ibmebus_request_irq(pr->eq->attr.ist1, | 1304 | ret = ibmebus_request_irq(pr->eq->attr.ist1, |
1305 | ehea_recv_irq_handler, | 1305 | ehea_recv_irq_handler, |
1306 | IRQF_DISABLED, pr->int_send_name, | 1306 | 0, pr->int_send_name, pr); |
1307 | pr); | ||
1308 | if (ret) { | 1307 | if (ret) { |
1309 | netdev_err(dev, "failed registering irq for ehea_queue port_res_nr:%d, ist=%X\n", | 1308 | netdev_err(dev, "failed registering irq for ehea_queue port_res_nr:%d, ist=%X\n", |
1310 | i, pr->eq->attr.ist1); | 1309 | i, pr->eq->attr.ist1); |
@@ -3320,7 +3319,7 @@ static int ehea_probe_adapter(struct platform_device *dev) | |||
3320 | } | 3319 | } |
3321 | 3320 | ||
3322 | ret = ibmebus_request_irq(adapter->neq->attr.ist1, | 3321 | ret = ibmebus_request_irq(adapter->neq->attr.ist1, |
3323 | ehea_interrupt_neq, IRQF_DISABLED, | 3322 | ehea_interrupt_neq, 0, |
3324 | "ehea_neq", adapter); | 3323 | "ehea_neq", adapter); |
3325 | if (ret) { | 3324 | if (ret) { |
3326 | dev_err(&dev->dev, "requesting NEQ IRQ failed\n"); | 3325 | dev_err(&dev->dev, "requesting NEQ IRQ failed\n"); |