From patchwork Mon Oct 14 23:58:59 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Soren Brinkmann X-Patchwork-Id: 283426 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 70D1F2C00DC for ; Tue, 15 Oct 2013 11:00:11 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757995Ab3JNX7e (ORCPT ); Mon, 14 Oct 2013 19:59:34 -0400 Received: from mail-pa0-f46.google.com ([209.85.220.46]:40235 "EHLO mail-pa0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757955Ab3JNX7b (ORCPT ); Mon, 14 Oct 2013 19:59:31 -0400 Received: by mail-pa0-f46.google.com with SMTP id fa1so8199125pad.19 for ; Mon, 14 Oct 2013 16:59:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=HP4g48oWkfL0vwGg02kMAWLr29TLxldVtbtgCD+F9dE=; b=xM/FpdLDKd7sEsen9T2RJ4NtpEl5HpkV3xlB/V2x/oETRq+HoyZA3f7XPO55VS8aXU wgR53qrlyMWs7pjntp5FheCSNeUNFfnoakb+9xSCw7j1fB4slprDU2PinHhoITYL6OFZ Q8j9kW0l3f+1dZKq3ZfSZlpeS8CNGiPcN8IheaVTJ/dLMX88aSCjWZiea3yYOyoYCGjF LxqIm9sAE+essojIwOgLsTOpK+9qf6wt/B0no5OlwLmus7+6nFUOAGCyG4kXvJ+n+GOR b0ClfK4eDSW0fVy4Ioy3Oa9QqqF8krHjDqjPTj8IgKAl6usWoyL+2GYFIfkngse0R4+n cJLg== X-Received: by 10.66.178.143 with SMTP id cy15mr40629513pac.105.1381795170749; Mon, 14 Oct 2013 16:59:30 -0700 (PDT) Received: from localhost ([149.199.62.254]) by mx.google.com with ESMTPSA id sb9sm80520018pbb.0.1969.12.31.16.00.00 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Mon, 14 Oct 2013 16:59:29 -0700 (PDT) From: Soren Brinkmann To: Nicolas Ferre Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Michal Simek , Soren Brinkmann Subject: [PATCH RFC 4/5] net: macb: Use devm_request_irq() Date: Mon, 14 Oct 2013 16:58:59 -0700 Message-Id: <1381795140-10792-5-git-send-email-soren.brinkmann@xilinx.com> X-Mailer: git-send-email 1.8.4 In-Reply-To: <1381795140-10792-1-git-send-email-soren.brinkmann@xilinx.com> References: <1381795140-10792-1-git-send-email-soren.brinkmann@xilinx.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Use the device managed interface to request the IRQ, simplifying error paths. Signed-off-by: Soren Brinkmann Acked-by: Nicolas Ferre --- 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);