| Message ID | 1381795140-10792-5-git-send-email-soren.brinkmann@xilinx.com |
|---|---|
| State | RFC, archived |
| Delegated to: | David Miller |
| Headers | show |
On 15/10/2013 01:58, Soren Brinkmann : > Use the device managed interface to request the IRQ, simplifying error > paths. > > Signed-off-by: Soren Brinkmann <soren.brinkmann@xilinx.com> Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> > --- > drivers/net/ethernet/cadence/macb.c | 8 +++----- > 1 file changed, 3 insertions(+), 5 deletions(-) > > diff --git a/drivers/net/ethernet/cadence/macb.c b/drivers/net/ethernet/cadence/macb.c > index 436aecc31732..603844b1d483 100644 > --- a/drivers/net/ethernet/cadence/macb.c > +++ b/drivers/net/ethernet/cadence/macb.c > @@ -1825,7 +1825,8 @@ static int __init macb_probe(struct platform_device *pdev) > } > > dev->irq = platform_get_irq(pdev, 0); > - err = request_irq(dev->irq, macb_interrupt, 0, dev->name, dev); > + err = devm_request_irq(&pdev->dev, dev->irq, macb_interrupt, 0, > + dev->name, dev); > if (err) { > dev_err(&pdev->dev, "Unable to request IRQ %d (error %d)\n", > dev->irq, err); > @@ -1892,7 +1893,7 @@ static int __init macb_probe(struct platform_device *pdev) > err = register_netdev(dev); > if (err) { > dev_err(&pdev->dev, "Cannot register net device, aborting.\n"); > - goto err_out_free_irq; > + goto err_out_disable_clocks; > } > > err = macb_mii_init(bp); > @@ -1915,8 +1916,6 @@ static int __init macb_probe(struct platform_device *pdev) > > err_out_unregister_netdev: > unregister_netdev(dev); > -err_out_free_irq: > - free_irq(dev->irq, dev); > err_out_disable_clocks: > clk_disable_unprepare(bp->hclk); > err_out_disable_pclk: > @@ -1942,7 +1941,6 @@ static int __exit macb_remove(struct platform_device *pdev) > kfree(bp->mii_bus->irq); > mdiobus_free(bp->mii_bus); > unregister_netdev(dev); > - free_irq(dev->irq, dev); > clk_disable_unprepare(bp->hclk); > clk_disable_unprepare(bp->pclk); > free_netdev(dev); >
Hello. On 10/15/2013 03:58 AM, Soren Brinkmann wrote: > Use the device managed interface to request the IRQ, simplifying error > paths. > Signed-off-by: Soren Brinkmann <soren.brinkmann@xilinx.com> > --- > drivers/net/ethernet/cadence/macb.c | 8 +++----- > 1 file changed, 3 insertions(+), 5 deletions(-) > diff --git a/drivers/net/ethernet/cadence/macb.c b/drivers/net/ethernet/cadence/macb.c > index 436aecc31732..603844b1d483 100644 > --- a/drivers/net/ethernet/cadence/macb.c > +++ b/drivers/net/ethernet/cadence/macb.c > @@ -1825,7 +1825,8 @@ static int __init macb_probe(struct platform_device *pdev) > } > > dev->irq = platform_get_irq(pdev, 0); > - err = request_irq(dev->irq, macb_interrupt, 0, dev->name, dev); > + err = devm_request_irq(&pdev->dev, dev->irq, macb_interrupt, 0, > + dev->name, dev); You should start the continuation line right under &. WBR, Sergei -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Tue, Oct 15, 2013 at 11:21:08PM +0400, Sergei Shtylyov wrote: > Hello. > > On 10/15/2013 03:58 AM, Soren Brinkmann wrote: > > >Use the device managed interface to request the IRQ, simplifying error > >paths. > > >Signed-off-by: Soren Brinkmann <soren.brinkmann@xilinx.com> > >--- > > drivers/net/ethernet/cadence/macb.c | 8 +++----- > > 1 file changed, 3 insertions(+), 5 deletions(-) > > >diff --git a/drivers/net/ethernet/cadence/macb.c b/drivers/net/ethernet/cadence/macb.c > >index 436aecc31732..603844b1d483 100644 > >--- a/drivers/net/ethernet/cadence/macb.c > >+++ b/drivers/net/ethernet/cadence/macb.c > >@@ -1825,7 +1825,8 @@ static int __init macb_probe(struct platform_device *pdev) > > } > > > > dev->irq = platform_get_irq(pdev, 0); > >- err = request_irq(dev->irq, macb_interrupt, 0, dev->name, dev); > >+ err = devm_request_irq(&pdev->dev, dev->irq, macb_interrupt, 0, > >+ dev->name, dev); > > You should start the continuation line right under &. Actually this one is a good example why I don't do such alignment: You do a simple search & replace - in this case request_irq -> devm_request_irq - and all alignment is gone. Sören -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 10/16/2013 12:20 AM, Sören Brinkmann wrote: >>> Use the device managed interface to request the IRQ, simplifying error >>> paths. >>> Signed-off-by: Soren Brinkmann <soren.brinkmann@xilinx.com> >>> --- >>> drivers/net/ethernet/cadence/macb.c | 8 +++----- >>> 1 file changed, 3 insertions(+), 5 deletions(-) >>> diff --git a/drivers/net/ethernet/cadence/macb.c b/drivers/net/ethernet/cadence/macb.c >>> index 436aecc31732..603844b1d483 100644 >>> --- a/drivers/net/ethernet/cadence/macb.c >>> +++ b/drivers/net/ethernet/cadence/macb.c >>> @@ -1825,7 +1825,8 @@ static int __init macb_probe(struct platform_device *pdev) >>> } >>> >>> dev->irq = platform_get_irq(pdev, 0); >>> - err = request_irq(dev->irq, macb_interrupt, 0, dev->name, dev); >>> + err = devm_request_irq(&pdev->dev, dev->irq, macb_interrupt, 0, >>> + dev->name, dev); >> You should start the continuation line right under &. > Actually this one is a good example why I don't do such alignment: You > do a simple search & replace - in this case request_irq -> > devm_request_irq - and all alignment is gone. I didn't understand why this is a good example. In this case you broke the line yourself and did it incorrectly, not following the networking coding style which assumes Emacs-style alignment for broken lines. > Sören WBR, Sergei -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/ethernet/cadence/macb.c b/drivers/net/ethernet/cadence/macb.c index 436aecc31732..603844b1d483 100644 --- a/drivers/net/ethernet/cadence/macb.c +++ b/drivers/net/ethernet/cadence/macb.c @@ -1825,7 +1825,8 @@ static int __init macb_probe(struct platform_device *pdev) } dev->irq = platform_get_irq(pdev, 0); - err = request_irq(dev->irq, macb_interrupt, 0, dev->name, dev); + err = devm_request_irq(&pdev->dev, dev->irq, macb_interrupt, 0, + dev->name, dev); if (err) { dev_err(&pdev->dev, "Unable to request IRQ %d (error %d)\n", dev->irq, err); @@ -1892,7 +1893,7 @@ static int __init macb_probe(struct platform_device *pdev) err = register_netdev(dev); if (err) { dev_err(&pdev->dev, "Cannot register net device, aborting.\n"); - goto err_out_free_irq; + goto err_out_disable_clocks; } err = macb_mii_init(bp); @@ -1915,8 +1916,6 @@ static int __init macb_probe(struct platform_device *pdev) err_out_unregister_netdev: unregister_netdev(dev); -err_out_free_irq: - free_irq(dev->irq, dev); err_out_disable_clocks: clk_disable_unprepare(bp->hclk); err_out_disable_pclk: @@ -1942,7 +1941,6 @@ static int __exit macb_remove(struct platform_device *pdev) kfree(bp->mii_bus->irq); mdiobus_free(bp->mii_bus); unregister_netdev(dev); - free_irq(dev->irq, dev); clk_disable_unprepare(bp->hclk); clk_disable_unprepare(bp->pclk); free_netdev(dev);
Use the device managed interface to request the IRQ, simplifying error paths. Signed-off-by: Soren Brinkmann <soren.brinkmann@xilinx.com> --- drivers/net/ethernet/cadence/macb.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)