leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

net/macb: remove useless calls of devm_free_irq()

Browse Source 
Inside macb_probe(), when devm_request_irq() fails on queue q, there is no need
to call devm_free_irq() on queues 0..q-1 because the managed device resources
are released later when calling free_netdev().

Also removing devm_free_irq() call from macb_remove() for the same reason.

Signed-off-by: Cyrille Pitchen <cyrille.pitchen@atmel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Cyrille Pitchen 2014-12-15 15:13:32 +01:00 committed by David S. Miller
parent e965be7d17
commit cf250de07c
1 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
drivers/net/ethernet/cadence/macb.c
View File

@ -2160,7 +2160,7 @@ static int __init macb_probe(struct platform_device *pdev)
int err = -ENXIO; int err = -ENXIO;
const char *mac; const char *mac;
void __iomem *mem; void __iomem *mem;
unsigned int hw_q, queue_mask, q, num_queues, q_irq = 0; unsigned int hw_q, queue_mask, q, num_queues;
struct clk *pclk, *hclk, *tx_clk; struct clk *pclk, *hclk, *tx_clk;
regs = platform_get_resource(pdev, IORESOURCE_MEM, 0); regs = platform_get_resource(pdev, IORESOURCE_MEM, 0);
@ -2235,11 +2235,11 @@ static int __init macb_probe(struct platform_device *pdev)
* register mapping but we don't want to test the queue index then * register mapping but we don't want to test the queue index then
* compute the corresponding register offset at run time. * compute the corresponding register offset at run time.
*/ */
for (hw_q = 0; hw_q < MACB_MAX_QUEUES; ++hw_q) { for (hw_q = 0, q = 0; hw_q < MACB_MAX_QUEUES; ++hw_q) {
if (!(queue_mask & (1 << hw_q))) if (!(queue_mask & (1 << hw_q)))
continue; continue;
queue = &bp->queues[q_irq]; queue = &bp->queues[q];
queue->bp = bp; queue->bp = bp;
if (hw_q) { if (hw_q) {
queue->ISR = GEM_ISR(hw_q - 1); queue->ISR = GEM_ISR(hw_q - 1);
@ -2261,18 +2261,18 @@ static int __init macb_probe(struct platform_device *pdev)
* must remove the optional gaps that could exist in the * must remove the optional gaps that could exist in the
* hardware queue mask. * hardware queue mask.
*/ */
queue->irq = platform_get_irq(pdev, q_irq); queue->irq = platform_get_irq(pdev, q);
err = devm_request_irq(&pdev->dev, queue->irq, macb_interrupt, err = devm_request_irq(&pdev->dev, queue->irq, macb_interrupt,
0, dev->name, queue); 0, dev->name, queue);
if (err) { if (err) {
dev_err(&pdev->dev, dev_err(&pdev->dev,
"Unable to request IRQ %d (error %d)\n", "Unable to request IRQ %d (error %d)\n",
queue->irq, err); queue->irq, err);
goto err_out_free_irq; goto err_out_free_netdev;
} }
INIT_WORK(&queue->tx_error_task, macb_tx_error_task); INIT_WORK(&queue->tx_error_task, macb_tx_error_task);
q_irq++; q++;
} }
dev->irq = bp->queues[0].irq; dev->irq = bp->queues[0].irq;
@ -2350,7 +2350,7 @@ static int __init macb_probe(struct platform_device *pdev)
err = register_netdev(dev); err = register_netdev(dev);
if (err) { if (err) {
dev_err(&pdev->dev, "Cannot register net device, aborting.\n"); dev_err(&pdev->dev, "Cannot register net device, aborting.\n");
goto err_out_free_irq; goto err_out_free_netdev;
} }
err = macb_mii_init(bp); err = macb_mii_init(bp);
@ -2373,9 +2373,7 @@ static int __init macb_probe(struct platform_device *pdev)
err_out_unregister_netdev: err_out_unregister_netdev:
unregister_netdev(dev); unregister_netdev(dev);
err_out_free_irq: err_out_free_netdev:
for (q = 0, queue = bp->queues; q < q_irq; ++q, ++queue)
devm_free_irq(&pdev->dev, queue->irq, queue);
free_netdev(dev); free_netdev(dev);
err_out_disable_clocks: err_out_disable_clocks:
if (!IS_ERR(tx_clk)) if (!IS_ERR(tx_clk))
@ -2392,8 +2390,6 @@ static int __exit macb_remove(struct platform_device *pdev)
{ {
struct net_device *dev; struct net_device *dev;
struct macb *bp; struct macb *bp;
struct macb_queue *queue;
unsigned int q;
dev = platform_get_drvdata(pdev); dev = platform_get_drvdata(pdev);
@ -2405,9 +2401,6 @@ static int __exit macb_remove(struct platform_device *pdev)
kfree(bp->mii_bus->irq); kfree(bp->mii_bus->irq);
mdiobus_free(bp->mii_bus); mdiobus_free(bp->mii_bus);
unregister_netdev(dev); unregister_netdev(dev);
queue = bp->queues;
for (q = 0; q < bp->num_queues; ++q, ++queue)
devm_free_irq(&pdev->dev, queue->irq, queue);
if (!IS_ERR(bp->tx_clk)) if (!IS_ERR(bp->tx_clk))
clk_disable_unprepare(bp->tx_clk); clk_disable_unprepare(bp->tx_clk);
clk_disable_unprepare(bp->hclk); clk_disable_unprepare(bp->hclk);