From patchwork Wed Aug 1 17:56:23 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arun Parameswaran X-Patchwork-Id: 10552773 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id D43A0157D for ; Wed, 1 Aug 2018 17:57:38 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CF8FF2B907 for ; Wed, 1 Aug 2018 17:57:38 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C40F72B912; Wed, 1 Aug 2018 17:57:38 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 64FE72B907 for ; Wed, 1 Aug 2018 17:57:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=7aIJsNNDiRCV0Gg8XWotrd7DwsGR6EEUk1yBBv+6XD4=; b=BIpahIE0N/FjVSjlxWPCWOaokC X5T5Ay4Cjb0bv7Jnl0DvtT4eL0uk79s3xghXfauMbtcxyrtZdtMKjXIEIHn5sEDTSKAkNEI3l4Uil m+pxvy5msayd/wyK2N01KbzF6TkHrEKqcKKywxTXSZqZ+b3xmHNVZjyd+Y7jvj7PeuTlxdhK4p/41 BnA0pZhecsl5BrNUltXRP/9LwxYWWCyW0IsxMYfeNAKsMUs71DSxIKaleGPunAKkE0q2Bv6W6RD+B 86RsllvMqytwvcb67oyC+efrcOGU8u1sP1n1ADTrYQLTCEtVq6L1QdqjVkXjC//O04vbR7iIO2L/T friYBNkQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1fkvNM-0003Fj-8r; Wed, 01 Aug 2018 17:57:32 +0000 Received: from mail-qt0-x241.google.com ([2607:f8b0:400d:c0d::241]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fkvMV-0001n4-6T for linux-arm-kernel@lists.infradead.org; Wed, 01 Aug 2018 17:56:45 +0000 Received: by mail-qt0-x241.google.com with SMTP id z8-v6so20862957qto.9 for ; Wed, 01 Aug 2018 10:56:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=KwrDBNo657A6SiUK12ekfX5MSVNPn+Tny6h4zOx1v7o=; b=ADN2M//OHKi4uiNBD4q4CyciI935grsJgXSOUkJwYhzhPZVKgyT+VgZjqFuOD6ucxr 8ejwydIZVEaeYsEt25pf+kdEsuiC9wJu78XjctwqGmEjh6EdnnXgjAESQi4OoKQJ5bqq Cmn46dzQI4iJvPd2hl6kqaQEZpah4q9JiWQiE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=KwrDBNo657A6SiUK12ekfX5MSVNPn+Tny6h4zOx1v7o=; b=INAlMaZBkXwIgyeXIT8zh286Fw1QkruZBotA2TNT8nMeusySE03LxSyOJXDVH7XjZ+ qtCxdcczbvNFudf8crtyCi1Exk0iES2RV9oYiF2yJGTT44LxHq3x4OniR6pc2IpmjyMb AtaM9yzBY6b+L3YDKJBX9XeesgNSZENwGOA3JkUwA+bnOw6U3QTa8F9yAz39MEgvonHZ CgvusESY1nDkSr0asUDkeLXmQki9TXm92EkJmtsonGXPXpHSQhV8YXurxUgBUdSTJz2G n7BYjIYUrmv9GG8ptDlmdrFJJ+tCW6YidhzZ5nLcIVwyZFchb2S0IWuuya9SrLArsd9b 7SQA== X-Gm-Message-State: AOUpUlHj1iwKlAE6s+muHdB0huppWIAakMnQ/VySMawm0VzimOcDO7U0 lA+PICRJTwnXSKxuj6SPZnlY1g== X-Google-Smtp-Source: AAOMgpdeIzDT19HL2XwHdCup+oDoPcFUrlF5G9CZMuof/QyUlZggaOLonbM2/sAVZrSVx/lu+EfdZw== X-Received: by 2002:a0c:d24d:: with SMTP id o13-v6mr23305952qvh.210.1533146188321; Wed, 01 Aug 2018 10:56:28 -0700 (PDT) Received: from lbrmn-lnxub86.ric.broadcom.com ([192.19.228.250]) by smtp.gmail.com with ESMTPSA id m12-v6sm14401729qkl.54.2018.08.01.10.56.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 01 Aug 2018 10:56:27 -0700 (PDT) From: Arun Parameswaran To: "David S. Miller" , Florian Fainelli , Andrew Lunn , Rob Herring , Mark Rutland , Ray Jui , Scott Branden , Catalin Marinas , Will Deacon Subject: [PATCH v3 5/8] net: phy: Use devm api for mdio bus allocation in bcm iproc mdio mux Date: Wed, 1 Aug 2018 10:56:23 -0700 Message-Id: <1533146186-8374-6-git-send-email-arun.parameswaran@broadcom.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1533146186-8374-1-git-send-email-arun.parameswaran@broadcom.com> References: <1533146186-8374-1-git-send-email-arun.parameswaran@broadcom.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180801_105639_978574_6C3C36FD X-CRM114-Status: GOOD ( 17.52 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, netdev@vger.kernel.org, Arun Parameswaran , linux-kernel@vger.kernel.org, bcm-kernel-feedback-list@broadcom.com, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Use devm_mdiobus_alloc() instead of mdiobus_alloc() in the Broadcom iProc mdio mux driver. Also, clear the driver data on error from probe or when remove() is called. Signed-off-by: Arun Parameswaran --- drivers/net/phy/mdio-mux-bcm-iproc.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/drivers/net/phy/mdio-mux-bcm-iproc.c b/drivers/net/phy/mdio-mux-bcm-iproc.c index c36ce4b..5640d78 100644 --- a/drivers/net/phy/mdio-mux-bcm-iproc.c +++ b/drivers/net/phy/mdio-mux-bcm-iproc.c @@ -198,7 +198,7 @@ static int mdio_mux_iproc_probe(struct platform_device *pdev) return PTR_ERR(md->base); } - md->mii_bus = mdiobus_alloc(); + md->mii_bus = devm_mdiobus_alloc(&pdev->dev); if (!md->mii_bus) { dev_err(&pdev->dev, "mdiomux bus alloc failed\n"); return -ENOMEM; @@ -217,7 +217,7 @@ static int mdio_mux_iproc_probe(struct platform_device *pdev) rc = mdiobus_register(bus); if (rc) { dev_err(&pdev->dev, "mdiomux registration failed\n"); - goto out; + return rc; } platform_set_drvdata(pdev, md); @@ -226,6 +226,7 @@ static int mdio_mux_iproc_probe(struct platform_device *pdev) &md->mux_handle, md, md->mii_bus); if (rc) { dev_info(md->dev, "mdiomux initialization failed\n"); + platform_set_drvdata(pdev, NULL); goto out_register; } @@ -236,8 +237,6 @@ static int mdio_mux_iproc_probe(struct platform_device *pdev) out_register: mdiobus_unregister(bus); -out: - mdiobus_free(bus); return rc; } @@ -247,7 +246,7 @@ static int mdio_mux_iproc_remove(struct platform_device *pdev) mdio_mux_uninit(md->mux_handle); mdiobus_unregister(md->mii_bus); - mdiobus_free(md->mii_bus); + platform_set_drvdata(pdev, NULL); return 0; }