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=-13.3 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,HK_RANDOM_FROM,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,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 CA395C433E0 for ; Mon, 15 Mar 2021 10:17:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 84B3864E20 for ; Mon, 15 Mar 2021 10:17:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229686AbhCOKRT (ORCPT ); Mon, 15 Mar 2021 06:17:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53004 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229964AbhCOKQv (ORCPT ); Mon, 15 Mar 2021 06:16:51 -0400 Received: from mail-wm1-x335.google.com (mail-wm1-x335.google.com [IPv6:2a00:1450:4864:20::335]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 61325C061574 for ; Mon, 15 Mar 2021 03:16:51 -0700 (PDT) Received: by mail-wm1-x335.google.com with SMTP id g20so7770161wmk.3 for ; Mon, 15 Mar 2021 03:16:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=58hGSBX7H8nGOBRskBWyk16Oz7UBORL1R+Y5nIDeG8I=; b=l+16VG6p0qdrMsxf2YNawvIlC9jdxD2LN3IKbdk2wdjI71Hhpc5ek30tdiao0bsfF3 6m8Lc4MYyy6P4m5pn2exxc6ZzkRk2sEpSVUVTaMJM12CsYU34DamkegIskhw87xR1Xhr oqiwJdEUm9hNqqZdrVEv5HoL7KXZwih6jQPixKP3xco4Bp89lSoHtS+O/U34vexZaQvJ 2X35wz5STY9JmDvf4GpABg+AOmVVgWZx4xkVYp3+iFxFL6/EWSOycOSn0l3oSEqXLthc 0HjwwUPmm7qvIxM9ULzLdJG9q+lGhwxfTxFmKJy1D+9XFkUxK+1m7QwfZg3sAvl3At+u 5ocg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=58hGSBX7H8nGOBRskBWyk16Oz7UBORL1R+Y5nIDeG8I=; b=OZNBs7xx/I/ikrc88C28kPcLcW/do2nqXCvSIADHhMaG9owkUbIyrPGtX6Jgn6mLDQ 7dUqPmZbreaD9/O82/uz4ANk5DidA/n2nenxhX+o1n/cvJzUvo9qgdAnXNQa317vYV/q Xo8/asthb3gCvQWHE544c6b6Uq3ZF7GkxH8b9QLvkCCFVyXmXEM4fRB/ZsGBeZxIa6hQ 1/OmPlhmj+mnwnJc1Iq6sPaunS1nS2P/oL78EDV4MUmYFGr0e6WNjZu1a9TAGj/oKqgs sfxbN2+horbzjsl1GTPOCi3IXVC7kxbBg+FEHKATiWEYLGaiMXKxYQrErKpDtWN6Vuaz X68g== X-Gm-Message-State: AOAM530F/z4Hg6TpA24Ziyca45QQoaEQDDd4M1WolUPfy48OLC5FpXzs aN+Sj1XAZafFTCBZMQarZTk= X-Google-Smtp-Source: ABdhPJyhDkqMcV8NQB0wZZj0PhdLbGGZJhKGoi7aO8kEJyA6JWBgoMPxyQxxahZ9pSkj6v2Y9wAVgA== X-Received: by 2002:a1c:2288:: with SMTP id i130mr25239574wmi.62.1615803410083; Mon, 15 Mar 2021 03:16:50 -0700 (PDT) Received: from agape.jhs ([5.171.72.229]) by smtp.gmail.com with ESMTPSA id z2sm17815581wrv.47.2021.03.15.03.16.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Mar 2021 03:16:49 -0700 (PDT) Date: Mon, 15 Mar 2021 11:16:47 +0100 From: Fabio Aiuto To: gregkh@linuxfoundation.org Cc: devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org Subject: [PATCH 11/15] staging: rtl8723bs: remove unused code blocks conditioned by never set CONFIG_CHECK_BT_HANG Message-ID: References: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.10.1 (2018-07-13) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org remove conditional code blocks checked by unused CONFIG_CHECK_BT_HANG cleaning required in TODO file: find and remove code blocks guarded by never set CONFIG_FOO defines Signed-off-by: Fabio Aiuto --- .../staging/rtl8723bs/hal/rtl8723b_hal_init.c | 31 ------------------- drivers/staging/rtl8723bs/hal/sdio_halinit.c | 7 ----- .../staging/rtl8723bs/include/rtl8723b_hal.h | 7 ----- 3 files changed, 45 deletions(-) diff --git a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c index 9f059fb78c7d..5854590e5811 100644 --- a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +++ b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c @@ -4421,34 +4421,3 @@ void rtl8723b_stop_thread(struct adapter *padapter) } #endif } - -#if defined(CONFIG_CHECK_BT_HANG) -extern void check_bt_status_work(void *data); -void rtl8723bs_init_checkbthang_workqueue(struct adapter *adapter) -{ - adapter->priv_checkbt_wq = alloc_workqueue("sdio_wq", 0, 0); - INIT_DELAYED_WORK(&adapter->checkbt_work, (void *)check_bt_status_work); -} - -void rtl8723bs_free_checkbthang_workqueue(struct adapter *adapter) -{ - if (adapter->priv_checkbt_wq) { - cancel_delayed_work_sync(&adapter->checkbt_work); - flush_workqueue(adapter->priv_checkbt_wq); - destroy_workqueue(adapter->priv_checkbt_wq); - adapter->priv_checkbt_wq = NULL; - } -} - -void rtl8723bs_cancle_checkbthang_workqueue(struct adapter *adapter) -{ - if (adapter->priv_checkbt_wq) - cancel_delayed_work_sync(&adapter->checkbt_work); -} - -void rtl8723bs_hal_check_bt_hang(struct adapter *adapter) -{ - if (adapter->priv_checkbt_wq) - queue_delayed_work(adapter->priv_checkbt_wq, &(adapter->checkbt_work), 0); -} -#endif diff --git a/drivers/staging/rtl8723bs/hal/sdio_halinit.c b/drivers/staging/rtl8723bs/hal/sdio_halinit.c index d0e5b482f382..82b54131c9ec 100644 --- a/drivers/staging/rtl8723bs/hal/sdio_halinit.c +++ b/drivers/staging/rtl8723bs/hal/sdio_halinit.c @@ -1420,11 +1420,4 @@ void rtl8723bs_set_hal_ops(struct adapter *padapter) pHalFunc->hal_xmit = &rtl8723bs_hal_xmit; pHalFunc->mgnt_xmit = &rtl8723bs_mgnt_xmit; pHalFunc->hal_xmitframe_enqueue = &rtl8723bs_hal_xmitframe_enqueue; - -#if defined(CONFIG_CHECK_BT_HANG) - pHalFunc->hal_init_checkbthang_workqueue = &rtl8723bs_init_checkbthang_workqueue; - pHalFunc->hal_free_checkbthang_workqueue = &rtl8723bs_free_checkbthang_workqueue; - pHalFunc->hal_cancle_checkbthang_workqueue = &rtl8723bs_cancle_checkbthang_workqueue; - pHalFunc->hal_checke_bt_hang = &rtl8723bs_hal_check_bt_hang; -#endif } diff --git a/drivers/staging/rtl8723bs/include/rtl8723b_hal.h b/drivers/staging/rtl8723bs/include/rtl8723b_hal.h index 0f787ec44b5b..6449238fb2a5 100644 --- a/drivers/staging/rtl8723bs/include/rtl8723b_hal.h +++ b/drivers/staging/rtl8723bs/include/rtl8723b_hal.h @@ -240,13 +240,6 @@ void _8051Reset8723(struct adapter *padapter); void rtl8723b_start_thread(struct adapter *padapter); void rtl8723b_stop_thread(struct adapter *padapter); -#if defined(CONFIG_CHECK_BT_HANG) -void rtl8723bs_init_checkbthang_workqueue(struct adapter *adapter); -void rtl8723bs_free_checkbthang_workqueue(struct adapter *adapter); -void rtl8723bs_cancle_checkbthang_workqueue(struct adapter *adapter); -void rtl8723bs_hal_check_bt_hang(struct adapter *adapter); -#endif - int FirmwareDownloadBT(struct adapter *adapter, struct rt_firmware *firmware); void CCX_FwC2HTxRpt_8723b(struct adapter *padapter, u8 *pdata, u8 len); -- 2.20.1 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.1 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,HK_RANDOM_FROM, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_1 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 98A40C433E0 for ; Mon, 15 Mar 2021 10:16:55 +0000 (UTC) Received: from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 2C59F64EB3 for ; Mon, 15 Mar 2021 10:16:55 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2C59F64EB3 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=driverdev-devel-bounces@linuxdriverproject.org Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id D8D6C42C2D; Mon, 15 Mar 2021 10:16:54 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id skUsfW9_LFza; Mon, 15 Mar 2021 10:16:54 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp2.osuosl.org (Postfix) with ESMTP id C581040172; Mon, 15 Mar 2021 10:16:53 +0000 (UTC) Received: from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 8B4A31BF384 for ; Mon, 15 Mar 2021 10:16:52 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 788BC4016B for ; Mon, 15 Mar 2021 10:16:52 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id dPB_pAKtVXih for ; Mon, 15 Mar 2021 10:16:52 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 Received: from mail-wm1-x331.google.com (mail-wm1-x331.google.com [IPv6:2a00:1450:4864:20::331]) by smtp2.osuosl.org (Postfix) with ESMTPS id BBBF640172 for ; Mon, 15 Mar 2021 10:16:51 +0000 (UTC) Received: by mail-wm1-x331.google.com with SMTP id j4-20020a05600c4104b029010c62bc1e20so19106155wmi.3 for ; Mon, 15 Mar 2021 03:16:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=58hGSBX7H8nGOBRskBWyk16Oz7UBORL1R+Y5nIDeG8I=; b=l+16VG6p0qdrMsxf2YNawvIlC9jdxD2LN3IKbdk2wdjI71Hhpc5ek30tdiao0bsfF3 6m8Lc4MYyy6P4m5pn2exxc6ZzkRk2sEpSVUVTaMJM12CsYU34DamkegIskhw87xR1Xhr oqiwJdEUm9hNqqZdrVEv5HoL7KXZwih6jQPixKP3xco4Bp89lSoHtS+O/U34vexZaQvJ 2X35wz5STY9JmDvf4GpABg+AOmVVgWZx4xkVYp3+iFxFL6/EWSOycOSn0l3oSEqXLthc 0HjwwUPmm7qvIxM9ULzLdJG9q+lGhwxfTxFmKJy1D+9XFkUxK+1m7QwfZg3sAvl3At+u 5ocg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=58hGSBX7H8nGOBRskBWyk16Oz7UBORL1R+Y5nIDeG8I=; b=DPXk6F6psW3jfE9/MBMS8j+r24yIeKJ3+N6TpsrV3CgQ1VrIac/7jGfb+S5pb5mDhM xz1UBcZJj/gFLWwqlQUeiqt4rv6LF7HbWo+mNE58/nDQoUBbOLbYT7Ncj9UQfq5VKX55 NRYNlOLujtRUxKgkuLpGcL30ohbSXLgSNQawoXryxtsTaZCybvDfN5FMlXvgHcz0uM7z YBSHgc6W+AmWF2kZZ5n+DPlBCOGki0Ca0TIxzStAsnq8/4b/SSe2NSpqHjEvikFbzPf9 eefzk8cGgmM3bZvZbQoa2ne3fn5HFxg7VEvSJeeggcV9GtMQuZACgEtt1gr7C/c7Dpf+ nioA== X-Gm-Message-State: AOAM533Oe5ahVBbLMIt1NARQhzQIrQuJBJu1G/c674lQHnbqeJDskd8f Sp7WInEQeybWrDuFoPHm+MeHvgYVrLs= X-Google-Smtp-Source: ABdhPJyhDkqMcV8NQB0wZZj0PhdLbGGZJhKGoi7aO8kEJyA6JWBgoMPxyQxxahZ9pSkj6v2Y9wAVgA== X-Received: by 2002:a1c:2288:: with SMTP id i130mr25239574wmi.62.1615803410083; Mon, 15 Mar 2021 03:16:50 -0700 (PDT) Received: from agape.jhs ([5.171.72.229]) by smtp.gmail.com with ESMTPSA id z2sm17815581wrv.47.2021.03.15.03.16.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Mar 2021 03:16:49 -0700 (PDT) Date: Mon, 15 Mar 2021 11:16:47 +0100 From: Fabio Aiuto To: gregkh@linuxfoundation.org Subject: [PATCH 11/15] staging: rtl8723bs: remove unused code blocks conditioned by never set CONFIG_CHECK_BT_HANG Message-ID: References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.10.1 (2018-07-13) X-BeenThere: driverdev-devel@linuxdriverproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux Driver Project Developer List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: driverdev-devel-bounces@linuxdriverproject.org Sender: "devel" remove conditional code blocks checked by unused CONFIG_CHECK_BT_HANG cleaning required in TODO file: find and remove code blocks guarded by never set CONFIG_FOO defines Signed-off-by: Fabio Aiuto --- .../staging/rtl8723bs/hal/rtl8723b_hal_init.c | 31 ------------------- drivers/staging/rtl8723bs/hal/sdio_halinit.c | 7 ----- .../staging/rtl8723bs/include/rtl8723b_hal.h | 7 ----- 3 files changed, 45 deletions(-) diff --git a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c index 9f059fb78c7d..5854590e5811 100644 --- a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +++ b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c @@ -4421,34 +4421,3 @@ void rtl8723b_stop_thread(struct adapter *padapter) } #endif } - -#if defined(CONFIG_CHECK_BT_HANG) -extern void check_bt_status_work(void *data); -void rtl8723bs_init_checkbthang_workqueue(struct adapter *adapter) -{ - adapter->priv_checkbt_wq = alloc_workqueue("sdio_wq", 0, 0); - INIT_DELAYED_WORK(&adapter->checkbt_work, (void *)check_bt_status_work); -} - -void rtl8723bs_free_checkbthang_workqueue(struct adapter *adapter) -{ - if (adapter->priv_checkbt_wq) { - cancel_delayed_work_sync(&adapter->checkbt_work); - flush_workqueue(adapter->priv_checkbt_wq); - destroy_workqueue(adapter->priv_checkbt_wq); - adapter->priv_checkbt_wq = NULL; - } -} - -void rtl8723bs_cancle_checkbthang_workqueue(struct adapter *adapter) -{ - if (adapter->priv_checkbt_wq) - cancel_delayed_work_sync(&adapter->checkbt_work); -} - -void rtl8723bs_hal_check_bt_hang(struct adapter *adapter) -{ - if (adapter->priv_checkbt_wq) - queue_delayed_work(adapter->priv_checkbt_wq, &(adapter->checkbt_work), 0); -} -#endif diff --git a/drivers/staging/rtl8723bs/hal/sdio_halinit.c b/drivers/staging/rtl8723bs/hal/sdio_halinit.c index d0e5b482f382..82b54131c9ec 100644 --- a/drivers/staging/rtl8723bs/hal/sdio_halinit.c +++ b/drivers/staging/rtl8723bs/hal/sdio_halinit.c @@ -1420,11 +1420,4 @@ void rtl8723bs_set_hal_ops(struct adapter *padapter) pHalFunc->hal_xmit = &rtl8723bs_hal_xmit; pHalFunc->mgnt_xmit = &rtl8723bs_mgnt_xmit; pHalFunc->hal_xmitframe_enqueue = &rtl8723bs_hal_xmitframe_enqueue; - -#if defined(CONFIG_CHECK_BT_HANG) - pHalFunc->hal_init_checkbthang_workqueue = &rtl8723bs_init_checkbthang_workqueue; - pHalFunc->hal_free_checkbthang_workqueue = &rtl8723bs_free_checkbthang_workqueue; - pHalFunc->hal_cancle_checkbthang_workqueue = &rtl8723bs_cancle_checkbthang_workqueue; - pHalFunc->hal_checke_bt_hang = &rtl8723bs_hal_check_bt_hang; -#endif } diff --git a/drivers/staging/rtl8723bs/include/rtl8723b_hal.h b/drivers/staging/rtl8723bs/include/rtl8723b_hal.h index 0f787ec44b5b..6449238fb2a5 100644 --- a/drivers/staging/rtl8723bs/include/rtl8723b_hal.h +++ b/drivers/staging/rtl8723bs/include/rtl8723b_hal.h @@ -240,13 +240,6 @@ void _8051Reset8723(struct adapter *padapter); void rtl8723b_start_thread(struct adapter *padapter); void rtl8723b_stop_thread(struct adapter *padapter); -#if defined(CONFIG_CHECK_BT_HANG) -void rtl8723bs_init_checkbthang_workqueue(struct adapter *adapter); -void rtl8723bs_free_checkbthang_workqueue(struct adapter *adapter); -void rtl8723bs_cancle_checkbthang_workqueue(struct adapter *adapter); -void rtl8723bs_hal_check_bt_hang(struct adapter *adapter); -#endif - int FirmwareDownloadBT(struct adapter *adapter, struct rt_firmware *firmware); void CCX_FwC2HTxRpt_8723b(struct adapter *padapter, u8 *pdata, u8 len); -- 2.20.1 _______________________________________________ devel mailing list devel@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel