Commit 965b2aa7 authored by Kamlakant Patel's avatar Kamlakant Patel Committed by David S. Miller

net/smsc911x: fix irq resource allocation failure

When smsc911x uses GPIO as the interrupt controller, and if both are
loaded as modules, we get following error:

"smsc911x: Could not allocate irq resource"

This issue is because of smsc911x using platform_get_resource to get
device tree based irq resource.

commit "9ec36caf (of/irq: do irq resolution in platform_get_irq)" and
commit "7085a7 (drivers: platform: parse IRQ flags from resources)" add
support in platform_get_irq to resolve irq and irq_flags respectively
for both modern device tree and legacy static platform data platforms.

Modify smsc911x driver to use platform_get_irq to pick up irq resource
correctly and use irq_get_trigger_type to get the IRQ trigger flags.
Signed-off-by: default avatarKamlakant Patel <kamlakant.patel@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d66bf7dd
...@@ -2418,9 +2418,9 @@ static int smsc911x_drv_probe(struct platform_device *pdev) ...@@ -2418,9 +2418,9 @@ static int smsc911x_drv_probe(struct platform_device *pdev)
struct net_device *dev; struct net_device *dev;
struct smsc911x_data *pdata; struct smsc911x_data *pdata;
struct smsc911x_platform_config *config = dev_get_platdata(&pdev->dev); struct smsc911x_platform_config *config = dev_get_platdata(&pdev->dev);
struct resource *res, *irq_res; struct resource *res;
unsigned int intcfg = 0; unsigned int intcfg = 0;
int res_size, irq_flags; int res_size, irq, irq_flags;
int retval; int retval;
res = platform_get_resource_byname(pdev, IORESOURCE_MEM, res = platform_get_resource_byname(pdev, IORESOURCE_MEM,
...@@ -2434,8 +2434,8 @@ static int smsc911x_drv_probe(struct platform_device *pdev) ...@@ -2434,8 +2434,8 @@ static int smsc911x_drv_probe(struct platform_device *pdev)
} }
res_size = resource_size(res); res_size = resource_size(res);
irq_res = platform_get_resource(pdev, IORESOURCE_IRQ, 0); irq = platform_get_irq(pdev, 0);
if (!irq_res) { if (irq <= 0) {
pr_warn("Could not allocate irq resource\n"); pr_warn("Could not allocate irq resource\n");
retval = -ENODEV; retval = -ENODEV;
goto out_0; goto out_0;
...@@ -2455,8 +2455,8 @@ static int smsc911x_drv_probe(struct platform_device *pdev) ...@@ -2455,8 +2455,8 @@ static int smsc911x_drv_probe(struct platform_device *pdev)
SET_NETDEV_DEV(dev, &pdev->dev); SET_NETDEV_DEV(dev, &pdev->dev);
pdata = netdev_priv(dev); pdata = netdev_priv(dev);
dev->irq = irq_res->start; dev->irq = irq;
irq_flags = irq_res->flags & IRQF_TRIGGER_MASK; irq_flags = irq_get_trigger_type(irq);
pdata->ioaddr = ioremap_nocache(res->start, res_size); pdata->ioaddr = ioremap_nocache(res->start, res_size);
pdata->dev = dev; pdata->dev = dev;
......
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