From patchwork Fri Jul 24 13:06:58 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Machek X-Patchwork-Id: 1335689 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=ucw.cz Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4BCqH157Ggz9sTF for ; Fri, 24 Jul 2020 23:07:09 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726636AbgGXNHB (ORCPT ); Fri, 24 Jul 2020 09:07:01 -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-Disposition: inline User-Agent: Mutt/1.10.1 (2018-07-13) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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-ctrl.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_device *pdev) ctrl->mwq = create_singlethread_workqueue("ngd_master"); if (!ctrl->mwq) { dev_err(&pdev->dev, "Failed to start master worker\n"); - ret = -ENOMEM; - goto wq_err; + qcom_slim_ngd_qmi_svc_event_deinit(&ctrl->qmi); + return -ENOMEM; } return 0; -wq_err: - qcom_slim_ngd_qmi_svc_event_deinit(&ctrl->qmi); - if (ctrl->mwq) - destroy_workqueue(ctrl->mwq); - - return ret; } static int qcom_slim_ngd_ctrl_probe(struct platform_device *pdev)