net: Remove NO_IRQ from powerpc-only network drivers
We'd like to eventually remove NO_IRQ on powerpc, so remove usages of it from powerpc-only drivers. Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Родитель
c20cb81193
Коммит
99c1790e5b
|
@ -192,7 +192,7 @@ struct fman_mac_params {
|
|||
/* A handle to the FM object this port related to */
|
||||
void *fm;
|
||||
/* MDIO exceptions interrupt source - not valid for all
|
||||
* MACs; MUST be set to 'NO_IRQ' for MACs that don't have
|
||||
* MACs; MUST be set to 0 for MACs that don't have
|
||||
* mdio-irq, or for polling
|
||||
*/
|
||||
void *dev_id; /* device cookie used by the exception cbs */
|
||||
|
|
|
@ -90,7 +90,7 @@ static int do_pd_setup(struct fs_enet_private *fep)
|
|||
int ret = -EINVAL;
|
||||
|
||||
fep->interrupt = irq_of_parse_and_map(ofdev->dev.of_node, 0);
|
||||
if (fep->interrupt == NO_IRQ)
|
||||
if (!fep->interrupt)
|
||||
goto out;
|
||||
|
||||
fep->fcc.fccp = of_iomap(ofdev->dev.of_node, 0);
|
||||
|
|
|
@ -99,7 +99,7 @@ static int do_pd_setup(struct fs_enet_private *fep)
|
|||
struct platform_device *ofdev = to_platform_device(fep->dev);
|
||||
|
||||
fep->interrupt = irq_of_parse_and_map(ofdev->dev.of_node, 0);
|
||||
if (fep->interrupt == NO_IRQ)
|
||||
if (!fep->interrupt)
|
||||
return -EINVAL;
|
||||
|
||||
fep->fec.fecp = of_iomap(ofdev->dev.of_node, 0);
|
||||
|
|
|
@ -99,7 +99,7 @@ static int do_pd_setup(struct fs_enet_private *fep)
|
|||
struct platform_device *ofdev = to_platform_device(fep->dev);
|
||||
|
||||
fep->interrupt = irq_of_parse_and_map(ofdev->dev.of_node, 0);
|
||||
if (fep->interrupt == NO_IRQ)
|
||||
if (!fep->interrupt)
|
||||
return -EINVAL;
|
||||
|
||||
fep->scc.sccp = of_iomap(ofdev->dev.of_node, 0);
|
||||
|
|
|
@ -2750,7 +2750,7 @@ static int emac_probe(struct platform_device *ofdev)
|
|||
/* Get interrupts. EMAC irq is mandatory, WOL irq is optional */
|
||||
dev->emac_irq = irq_of_parse_and_map(np, 0);
|
||||
dev->wol_irq = irq_of_parse_and_map(np, 1);
|
||||
if (dev->emac_irq == NO_IRQ) {
|
||||
if (!dev->emac_irq) {
|
||||
printk(KERN_ERR "%s: Can't map main interrupt\n", np->full_name);
|
||||
goto err_free;
|
||||
}
|
||||
|
@ -2913,9 +2913,9 @@ static int emac_probe(struct platform_device *ofdev)
|
|||
err_reg_unmap:
|
||||
iounmap(dev->emacp);
|
||||
err_irq_unmap:
|
||||
if (dev->wol_irq != NO_IRQ)
|
||||
if (dev->wol_irq)
|
||||
irq_dispose_mapping(dev->wol_irq);
|
||||
if (dev->emac_irq != NO_IRQ)
|
||||
if (dev->emac_irq)
|
||||
irq_dispose_mapping(dev->emac_irq);
|
||||
err_free:
|
||||
free_netdev(ndev);
|
||||
|
@ -2957,9 +2957,9 @@ static int emac_remove(struct platform_device *ofdev)
|
|||
emac_dbg_unregister(dev);
|
||||
iounmap(dev->emacp);
|
||||
|
||||
if (dev->wol_irq != NO_IRQ)
|
||||
if (dev->wol_irq)
|
||||
irq_dispose_mapping(dev->wol_irq);
|
||||
if (dev->emac_irq != NO_IRQ)
|
||||
if (dev->emac_irq)
|
||||
irq_dispose_mapping(dev->emac_irq);
|
||||
|
||||
free_netdev(dev->ndev);
|
||||
|
|
|
@ -597,9 +597,8 @@ static int mal_probe(struct platform_device *ofdev)
|
|||
mal->rxde_irq = irq_of_parse_and_map(ofdev->dev.of_node, 4);
|
||||
}
|
||||
|
||||
if (mal->txeob_irq == NO_IRQ || mal->rxeob_irq == NO_IRQ ||
|
||||
mal->serr_irq == NO_IRQ || mal->txde_irq == NO_IRQ ||
|
||||
mal->rxde_irq == NO_IRQ) {
|
||||
if (!mal->txeob_irq || !mal->rxeob_irq || !mal->serr_irq ||
|
||||
!mal->txde_irq || !mal->rxde_irq) {
|
||||
printk(KERN_ERR
|
||||
"mal%d: failed to map interrupts !\n", index);
|
||||
err = -ENODEV;
|
||||
|
|
|
@ -1424,7 +1424,7 @@ static int init_sub_crq_irqs(struct ibmvnic_adapter *adapter)
|
|||
scrq = adapter->tx_scrq[i];
|
||||
scrq->irq = irq_create_mapping(NULL, scrq->hw_irq);
|
||||
|
||||
if (scrq->irq == NO_IRQ) {
|
||||
if (!scrq->irq) {
|
||||
rc = -EINVAL;
|
||||
dev_err(dev, "Error mapping irq\n");
|
||||
goto req_tx_irq_failed;
|
||||
|
@ -1444,7 +1444,7 @@ static int init_sub_crq_irqs(struct ibmvnic_adapter *adapter)
|
|||
for (i = 0; i < adapter->req_rx_queues; i++) {
|
||||
scrq = adapter->rx_scrq[i];
|
||||
scrq->irq = irq_create_mapping(NULL, scrq->hw_irq);
|
||||
if (scrq->irq == NO_IRQ) {
|
||||
if (!scrq->irq) {
|
||||
rc = -EINVAL;
|
||||
dev_err(dev, "Error mapping irq\n");
|
||||
goto req_rx_irq_failed;
|
||||
|
|
|
@ -1791,7 +1791,7 @@ fail_alloc_rx:
|
|||
gelic_card_free_chain(card, card->tx_chain.head);
|
||||
fail_alloc_tx:
|
||||
free_irq(card->irq, card);
|
||||
netdev->irq = NO_IRQ;
|
||||
netdev->irq = 0;
|
||||
fail_request_irq:
|
||||
ps3_sb_event_receive_port_destroy(dev, card->irq);
|
||||
fail_alloc_irq:
|
||||
|
@ -1843,7 +1843,7 @@ static int ps3_gelic_driver_remove(struct ps3_system_bus_device *dev)
|
|||
netdev0 = card->netdev[GELIC_PORT_ETHERNET_0];
|
||||
/* disconnect event port */
|
||||
free_irq(card->irq, card);
|
||||
netdev0->irq = NO_IRQ;
|
||||
netdev0->irq = 0;
|
||||
ps3_sb_event_receive_port_destroy(card->dev, card->irq);
|
||||
|
||||
wait_event(card->waitq,
|
||||
|
|
Загрузка…
Ссылка в новой задаче