Commit c0032d6e authored by Lad Prabhakar's avatar Lad Prabhakar Committed by David S. Miller

ethernet: netsec: Use platform_get_irq() to get the interrupt

platform_get_resource(pdev, IORESOURCE_IRQ, ..) relies on static
allocation of IRQ resources in DT core code, this causes an issue
when using hierarchical interrupt domains using "interrupts" property
in the node as this bypasses the hierarchical setup and messes up the
irq chaining.

In preparation for removal of static setup of IRQ resource from DT core
code use platform_get_irq().
Signed-off-by: default avatarLad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f4dd5174
...@@ -1977,11 +1977,12 @@ static int netsec_register_mdio(struct netsec_priv *priv, u32 phy_addr) ...@@ -1977,11 +1977,12 @@ static int netsec_register_mdio(struct netsec_priv *priv, u32 phy_addr)
static int netsec_probe(struct platform_device *pdev) static int netsec_probe(struct platform_device *pdev)
{ {
struct resource *mmio_res, *eeprom_res, *irq_res; struct resource *mmio_res, *eeprom_res;
struct netsec_priv *priv; struct netsec_priv *priv;
u32 hw_ver, phy_addr = 0; u32 hw_ver, phy_addr = 0;
struct net_device *ndev; struct net_device *ndev;
int ret; int ret;
int irq;
mmio_res = platform_get_resource(pdev, IORESOURCE_MEM, 0); mmio_res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
if (!mmio_res) { if (!mmio_res) {
...@@ -1995,11 +1996,9 @@ static int netsec_probe(struct platform_device *pdev) ...@@ -1995,11 +1996,9 @@ static int netsec_probe(struct platform_device *pdev)
return -ENODEV; return -ENODEV;
} }
irq_res = platform_get_resource(pdev, IORESOURCE_IRQ, 0); irq = platform_get_irq(pdev, 0);
if (!irq_res) { if (irq < 0)
dev_err(&pdev->dev, "No IRQ resource found.\n"); return irq;
return -ENODEV;
}
ndev = alloc_etherdev(sizeof(*priv)); ndev = alloc_etherdev(sizeof(*priv));
if (!ndev) if (!ndev)
...@@ -2010,7 +2009,7 @@ static int netsec_probe(struct platform_device *pdev) ...@@ -2010,7 +2009,7 @@ static int netsec_probe(struct platform_device *pdev)
spin_lock_init(&priv->reglock); spin_lock_init(&priv->reglock);
SET_NETDEV_DEV(ndev, &pdev->dev); SET_NETDEV_DEV(ndev, &pdev->dev);
platform_set_drvdata(pdev, priv); platform_set_drvdata(pdev, priv);
ndev->irq = irq_res->start; ndev->irq = irq;
priv->dev = &pdev->dev; priv->dev = &pdev->dev;
priv->ndev = ndev; priv->ndev = ndev;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment