From patchwork Thu Dec 10 14:02:04 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zheng Yongjun X-Patchwork-Id: 11964735 X-Patchwork-Delegate: kvalo@adurom.com 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=-16.7 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham 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 159A3C4361B for ; Thu, 10 Dec 2020 14:02:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id AF37223C81 for ; Thu, 10 Dec 2020 14:02:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389881AbgLJOCl (ORCPT ); Thu, 10 Dec 2020 09:02:41 -0500 Received: from szxga07-in.huawei.com ([45.249.212.35]:9865 "EHLO szxga07-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389750AbgLJOCZ (ORCPT ); Thu, 10 Dec 2020 09:02:25 -0500 Received: from DGGEMS404-HUB.china.huawei.com (unknown [172.30.72.60]) by szxga07-in.huawei.com (SkyGuard) with ESMTP id 4CsFvB2dNNz7C5G; Thu, 10 Dec 2020 22:01:10 +0800 (CST) Received: from ubuntu.network (10.175.138.68) by DGGEMS404-HUB.china.huawei.com (10.3.19.204) with Microsoft SMTP Server id 14.3.487.0; Thu, 10 Dec 2020 22:01:36 +0800 From: Zheng Yongjun To: , , , , CC: , , Zheng Yongjun Subject: [PATCH wireless -next] wireless/ath10k: simplify the return expression of ath10k_ahb_chip_reset() Date: Thu, 10 Dec 2020 22:02:04 +0800 Message-ID: <20201210140204.1774-1-zhengyongjun3@huawei.com> X-Mailer: git-send-email 2.22.0 MIME-Version: 1.0 X-Originating-IP: [10.175.138.68] X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org Simplify the return expression. Signed-off-by: Zheng Yongjun --- drivers/net/wireless/ath/ath10k/ahb.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/drivers/net/wireless/ath/ath10k/ahb.c b/drivers/net/wireless/ath/ath10k/ahb.c index 05a61975c83f..0ba31c0bbd24 100644 --- a/drivers/net/wireless/ath/ath10k/ahb.c +++ b/drivers/net/wireless/ath/ath10k/ahb.c @@ -598,16 +598,10 @@ static int ath10k_ahb_prepare_device(struct ath10k *ar) static int ath10k_ahb_chip_reset(struct ath10k *ar) { - int ret; - ath10k_ahb_halt_chip(ar); ath10k_ahb_clock_disable(ar); - ret = ath10k_ahb_prepare_device(ar); - if (ret) - return ret; - - return 0; + return ath10k_ahb_prepare_device(ar); } static int ath10k_ahb_wake_target_cpu(struct ath10k *ar)