From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-11.5 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7C238C433DF for ; Fri, 24 Jul 2020 13:07:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 644E22065F for ; Fri, 24 Jul 2020 13:07:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726652AbgGXNHC (ORCPT ); Fri, 24 Jul 2020 09:07:02 -0400 Received: from jabberwock.ucw.cz ([46.255.230.98]:57296 "EHLO jabberwock.ucw.cz" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726182AbgGXNHA (ORCPT ); Fri, 24 Jul 2020 09:07:00 -0400 Received: by jabberwock.ucw.cz (Postfix, from userid 1017) id 0DE021C0BDD; Fri, 24 Jul 2020 15:06:59 +0200 (CEST) Date: Fri, 24 Jul 2020 15:06:58 +0200 From: Pavel Machek To: amitkarwar@gmail.com, ganapathi.bhat@nxp.com, huxinming820@gmail.com, kvalo@codeaurora.org, davem@davemloft.net, kuba@kernel.org, linux-wireless@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, trivial@kernel.org Subject: [PATCH] slimbus: ngd: simplify error handling Message-ID: <20200724130658.GA29458@duo.ucw.cz> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="HcAYCG3uE/tztfnV" Content-Disposition: inline User-Agent: Mutt/1.10.1 (2018-07-13) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --HcAYCG3uE/tztfnV Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Simplify error handling; we already know mwq is NULL. Signed-off-by: Pavel Machek (CIP) diff --git a/drivers/slimbus/qcom-ngd-ctrl.c b/drivers/slimbus/qcom-ngd-ctr= l.c index 743ee7b4e63f..3def0c782c7f 100644 --- a/drivers/slimbus/qcom-ngd-ctrl.c +++ b/drivers/slimbus/qcom-ngd-ctrl.c @@ -1396,17 +1396,11 @@ static int qcom_slim_ngd_probe(struct platform_devi= ce *pdev) ctrl->mwq =3D create_singlethread_workqueue("ngd_master"); if (!ctrl->mwq) { dev_err(&pdev->dev, "Failed to start master worker\n"); - ret =3D -ENOMEM; - goto wq_err; + qcom_slim_ngd_qmi_svc_event_deinit(&ctrl->qmi); + return -ENOMEM; } =20 return 0; -wq_err: - qcom_slim_ngd_qmi_svc_event_deinit(&ctrl->qmi); - if (ctrl->mwq) - destroy_workqueue(ctrl->mwq); - - return ret; } =20 static int qcom_slim_ngd_ctrl_probe(struct platform_device *pdev) --=20 (english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blo= g.html --HcAYCG3uE/tztfnV Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iF0EABECAB0WIQRPfPO7r0eAhk010v0w5/Bqldv68gUCXxrc8gAKCRAw5/Bqldv6 8t64AJ9TkLMXPTQazgz1+ieXgOtgBpnQygCggKxDeQohVmkoaZvXGkAfjTtg0hk= =qEGF -----END PGP SIGNATURE----- --HcAYCG3uE/tztfnV--