Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Date:   Tue, 21 Jul 2020 15:01:57 +0800
From:   Jisheng Zhang <Jisheng.Zhang@synaptics.com>
To:     Andrew Lunn <andrew@lunn.ch>,
        Florian Fainelli <f.fainelli@gmail.com>,
        Heiner Kallweit <hkallweit1@gmail.com>,
        Russell King <linux@armlinux.org.uk>,
        "David S. Miller" <davem@davemloft.net>,
        Jakub Kicinski <kuba@kernel.org>
Cc:     netdev@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH net-next] net: mdio-mux-gpio: use devm_gpiod_get_array()
Message-ID: <20200721150134.5ba52595@xhacker.debian>
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
MIME-Version: 1.0
X-MS-Exchange-MessageSentRepresentingType: 1
Received: from xhacker.debian (124.74.246.114) by TYCPR01CA0095.jpnprd01.prod.outlook.com (2603:1096:405:3::35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3195.18 via Frontend Transport; Tue, 21 Jul 2020 07:02:52 +0000
X-Mailer: Claws Mail 3.17.5 (GTK+ 2.24.32; x86_64-pc-linux-gnu)
X-Originating-IP: [124.74.246.114]
X-MS-PublicTrafficType: Email
X-MS-Office365-Filtering-Correlation-Id: 267efcd9-9517-4ad1-251a-08d82d44179b
X-MS-TrafficTypeDiagnostic: BYAPR03MB4599:
X-Microsoft-Antispam-PRVS: <BYAPR03MB4599BB71E7DBE09B91FD03DFED780@BYAPR03MB4599.namprd03.prod.outlook.com>
X-MS-Oob-TLC-OOBClassifiers: OLM:121;
X-MS-Exchange-SenderADCheck: 1
X-Microsoft-Antispam: BCL:0;
X-Microsoft-Antispam-Message-Info: Simu/yEHWFoA0aYkDzHuWhK1wNjCvQgMtmwAS5fGbEJ19HiJsns6JJGjz1il84xVGgrgY6Ua6FAseOWP7zqECH/sC56iT1rgBm+sOXe/pFDvO7Ds58PTt6OCYQ3Izg7KyQy2F6IfN9G8rhg55YQbnHwvUwwhcr7ot79nE+LTBjtRIi+UGQQS8MhJrz+58l+9As4hKSUC+PGca8H5fzUrGJ9DzElNx0dHarUfoRspUnOQz99NMcf5EDEkxGsmU2LdqwjsTtCinTpqMWxBcsVj2W+qbfj93KBNw2T7KpxsdfASXgVeSbKNBZZsRHTG+ptvFndCxYF7uMPhTCaT2iCbSg==
X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BYAPR03MB3573.namprd03.prod.outlook.com;PTR:;CAT:NONE;SFTY:;SFS:(396003)(136003)(376002)(366004)(346002)(39860400002)(478600001)(4326008)(186003)(66946007)(52116002)(26005)(956004)(7696005)(16526019)(6506007)(86362001)(1076003)(110136005)(5660300002)(8676002)(2906002)(55016002)(83380400001)(9686003)(8936002)(66556008)(66476007)(316002);DIR:OUT;SFP:1101;
X-MS-Exchange-AntiSpam-MessageData: Wv36h7pBlBfMpTpI8awrFvGtQvQhkFyJY4XSaENGjuI3KOvosQOM6Q8aW/YfQseEbGx3KsCFEdwuv35/ANctjUjeIk+yl2mMBS2OPBKrMnOtOs4lCb4CnU0XnQpibvFe530au2eu2pJ52Xj3fJVlpvSAq2aBHMrPeOFUWZ56UuQxwMjQZrzG/oJfVfZ3+iH31qvVSPHxPKx5gYYyIk/bDatIypN0wJ9bFXbqiFlqR61AWoZXYQXFVBq69tTlRvBAi04yEDWemFf/c3qWr5r/R/UDvr11QGkWV5Y8CbSJ4BsECyxuU1ts3lT+hJsI9DADy+fGFocg5QumYUXqIhhX9tM/uUTZp/4yp/sQ4abePb4uOMTojkeT2nJnmEJdr3Ld9y/c43Lk0BNEEISxACaVnTVlgaq1Q1pRTGasNkc9I3s9bKEoyKbs1wVXadI2fxZWwynFmp7ZAyN2N2XfYmckQCJHlMdS34HTWf8dSljfUnraGsUzt6a10TbU5GRLYzKv
X-OriginatorOrg: synaptics.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 267efcd9-9517-4ad1-251a-08d82d44179b
X-MS-Exchange-CrossTenant-AuthSource: BYAPR03MB3573.namprd03.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Jul 2020 07:02:55.4552
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 335d1fbc-2124-4173-9863-17e7051a2a0e
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: pD/xWSVeBD4Ls4kCC80/GehnPXEjeb+eaFgUJ75gi7YT6Z5VljAQcNaFbt5g/UifK/AMtSBhjz5siuCd5pF12g==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR03MB4599
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Use devm_gpiod_get_array() to simplify the error handling and exit
code path.

Signed-off-by: Jisheng Zhang <Jisheng.Zhang@synaptics.com>
---
 drivers/net/phy/mdio-mux-gpio.c | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/drivers/net/phy/mdio-mux-gpio.c b/drivers/net/phy/mdio-mux-gpio.c
index 6c8960df43b0..10a758fdc9e6 100644
--- a/drivers/net/phy/mdio-mux-gpio.c
+++ b/drivers/net/phy/mdio-mux-gpio.c
@@ -42,25 +42,21 @@ static int mdio_mux_gpio_probe(struct platform_device *pdev)
 	struct gpio_descs *gpios;
 	int r;
 
-	gpios = gpiod_get_array(&pdev->dev, NULL, GPIOD_OUT_LOW);
+	gpios = devm_gpiod_get_array(&pdev->dev, NULL, GPIOD_OUT_LOW);
 	if (IS_ERR(gpios))
 		return PTR_ERR(gpios);
 
 	s = devm_kzalloc(&pdev->dev, sizeof(*s), GFP_KERNEL);
-	if (!s) {
-		gpiod_put_array(gpios);
+	if (!s)
 		return -ENOMEM;
-	}
 
 	s->gpios = gpios;
 
 	r = mdio_mux_init(&pdev->dev, pdev->dev.of_node,
 			  mdio_mux_gpio_switch_fn, &s->mux_handle, s, NULL);
 
-	if (r != 0) {
-		gpiod_put_array(s->gpios);
+	if (r != 0)
 		return r;
-	}
 
 	pdev->dev.platform_data = s;
 	return 0;
@@ -70,7 +66,6 @@ static int mdio_mux_gpio_remove(struct platform_device *pdev)
 {
 	struct mdio_mux_gpio_state *s = dev_get_platdata(&pdev->dev);
 	mdio_mux_uninit(s->mux_handle);
-	gpiod_put_array(s->gpios);
 	return 0;
 }
 
-- 
2.28.0.rc0