openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

net: ethernet: cpsw: unroll IRQ request loop 

This patch is in preparation for a nicer IRQ
handling scheme where we use different IRQ
handlers for each IRQ line (as it should be).

Later, we will also drop IRQs offset 0 and 3
because they are always disabled in this driver.

Signed-off-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Felipe Balbi 2015-01-16 10:11:11 -06:00 committed by David S. Miller
parent 053c095a82
commit 5087b915d5
1 changed files with 48 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
drivers/net/ethernet/ti/cpsw.c
View File

@ -2163,7 +2163,8 @@ static int cpsw_probe(struct platform_device *pdev)
void __iomem *ss_regs; void __iomem *ss_regs;
struct resource *res, *ss_res; struct resource *res, *ss_res;
u32 slave_offset, sliver_offset, slave_size; u32 slave_offset, sliver_offset, slave_size;
int ret = 0, i, k = 0; int ret = 0, i;
int irq;
ndev = alloc_etherdev(sizeof(struct cpsw_priv)); ndev = alloc_etherdev(sizeof(struct cpsw_priv));
if (!ndev) { if (!ndev) {
@ -2352,24 +2353,55 @@ static int cpsw_probe(struct platform_device *pdev)
goto clean_ale_ret; goto clean_ale_ret;
} }
while ((res = platform_get_resource(priv->pdev, IORESOURCE_IRQ, k))) { irq = platform_get_irq(pdev, 0);
if (k >= ARRAY_SIZE(priv->irqs_table)) { if (irq < 0)
ret = -EINVAL;
goto clean_ale_ret; goto clean_ale_ret;
}
ret = devm_request_irq(&pdev->dev, res->start, cpsw_interrupt, priv->irqs_table[0] = irq;
ret = devm_request_irq(&pdev->dev, irq, cpsw_interrupt,
0, dev_name(&pdev->dev), priv); 0, dev_name(&pdev->dev), priv);
if (ret < 0) { if (ret < 0) {
dev_err(priv->dev, "error attaching irq (%d)\n", ret); dev_err(priv->dev, "error attaching irq (%d)\n", ret);
goto clean_ale_ret; goto clean_ale_ret;
} }
priv->irqs_table[k] = res->start; irq = platform_get_irq(pdev, 1);
k++; if (irq < 0)
goto clean_ale_ret;
priv->irqs_table[1] = irq;
ret = devm_request_irq(&pdev->dev, irq, cpsw_interrupt,
0, dev_name(&pdev->dev), priv);
if (ret < 0) {
dev_err(priv->dev, "error attaching irq (%d)\n", ret);
goto clean_ale_ret;
} }
priv->num_irqs = k; irq = platform_get_irq(pdev, 2);
if (irq < 0)
goto clean_ale_ret;
priv->irqs_table[2] = irq;
ret = devm_request_irq(&pdev->dev, irq, cpsw_interrupt,
0, dev_name(&pdev->dev), priv);
if (ret < 0) {
dev_err(priv->dev, "error attaching irq (%d)\n", ret);
goto clean_ale_ret;
}
irq = platform_get_irq(pdev, 3);
if (irq < 0)
goto clean_ale_ret;
priv->irqs_table[3] = irq;
ret = devm_request_irq(&pdev->dev, irq, cpsw_interrupt,
0, dev_name(&pdev->dev), priv);
if (ret < 0) {
dev_err(priv->dev, "error attaching irq (%d)\n", ret);
goto clean_ale_ret;
}
priv->num_irqs = 4;
ndev->features |= NETIF_F_HW_VLAN_CTAG_FILTER; ndev->features |= NETIF_F_HW_VLAN_CTAG_FILTER;