From patchwork Fri Oct 13 14:24:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Johnson X-Patchwork-Id: 152594 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2908:b0:403:3b70:6f57 with SMTP id ib8csp1930862vqb; Fri, 13 Oct 2023 07:24:46 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGcgX1lMWE3Ki1DVGeroqieYRerin/FfJt+TFNSKIrFhRaggo8Va1Phs+z1b1DdFzckb7L/ X-Received: by 2002:a05:6359:219:b0:14a:cca4:5601 with SMTP id ej25-20020a056359021900b0014acca45601mr21793655rwb.3.1697207086330; Fri, 13 Oct 2023 07:24:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697207086; cv=none; d=google.com; s=arc-20160816; b=mmFnJr1IuoRTJdMxzaNaS0LdgfWvF/CA3nQXlwYeXSKjEEowxy+pAVzrSfmTvGUidW kwutENrbXCdehySO+29bBdsM+0yczxdn34UXdXx8qviGw83Hr71NDlPLth5Y2MVXRLHi //rieaR81qoW3WWrwcp1I9tMfg0tUSR/gNWBPhNinDs36G+i87PcETG1WVj63Bwea8nS cD7y2PXJhdLUkrDdZkp9q0ohLgpsFKp+1e+Ivy+SHjccososrsPi8jdEwfy3tf+/9Bdk xIBs2UGt/gY5CqoYOlv7IVBzIAWv8tfnFfj7hFDLsflJUNmSOUgZVX6ONKpKhh+hl3Qk DQ8Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=+6I0AQwGs3UbA5zjU9MEBUHD6ofogj+7asD/bxCen0I=; fh=uCFY6b9B5eq2rRlf8pS4TfIu4NTbI8oEOjzBnGL2Mns=; b=hyknMJJ/Cc4IXMm7J+R5G8w9YdOlK7fwZLq2deM8KGdRXlXByQqaWOOu6j4ZD/C14v Pp/FSlMih0uuVBdYkWije+Jn41oW2P94bjtc4KzkHVmgRFO4YjfDIatzzQotvhtJqj0D x+E95PuOpuC+FiqEIy/ff2J8GnOlFMyQhpN8c3LoxuwNLeOi3kRW8ZWHOhkuPJPTW1cS tHuFbcI9H0njPSejAI3qY7l/LTDm6r7SPjB5I9oHfpAH4pVU6EbyCw9N9MYDhsW7eY8j x56me2TBM136O+hFEoXSL0bf4VmhzRf1+8EwXh90vV77oMDyrPjTEVIZy0Fm04GGo6wy Bzww== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@quicinc.com header.s=qcppdkim1 header.b=kcPMq5Ul; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=quicinc.com Received: from snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id p16-20020a056a000b5000b0069ce50e2e34si17313577pfo.290.2023.10.13.07.24.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Oct 2023 07:24:46 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; dkim=pass header.i=@quicinc.com header.s=qcppdkim1 header.b=kcPMq5Ul; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=quicinc.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id A47D38029452; Fri, 13 Oct 2023 07:24:45 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232144AbjJMOYh (ORCPT + 19 others); Fri, 13 Oct 2023 10:24:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60918 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232118AbjJMOYf (ORCPT ); Fri, 13 Oct 2023 10:24:35 -0400 Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.131]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7C38ACE; Fri, 13 Oct 2023 07:24:33 -0700 (PDT) Received: from pps.filterd (m0279868.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 39DDaxgB001036; Fri, 13 Oct 2023 14:24:11 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=quicinc.com; h=from : date : subject : mime-version : content-type : content-transfer-encoding : message-id : references : in-reply-to : to : cc; s=qcppdkim1; bh=+6I0AQwGs3UbA5zjU9MEBUHD6ofogj+7asD/bxCen0I=; b=kcPMq5Ula18AiIRbt8KeJAKg7boR+L1KlwN8Ui4iUzEi8ZpMmVG8d6dRMGPbYjCfccJj qpvH10GVd03rQ2qSUaoHp47qEMOB6HNpDq1XYxoZ/jIcNWY+/eps3Tyv7q8b6KPY/Z0d t9pdilq98q3PWZqJFP05pva+81itVvd3QLHopyQgAeJvdYGG7Ui8mMGz8QuhZZzkYMqU 6RATG6vBIU/bVwNubz4VG9Q9v5iQZJn6FUDFJ1x3wxv3x7nPCzpupJyXUf6he4tjdhrv WD3m1lSbkamIFQ5TJBalMBut7khASTMGYUsixftdAIchbbdKHf0iK/HHA0nCG0NQkz3E PQ== Received: from nalasppmta04.qualcomm.com (Global_NAT1.qualcomm.com [129.46.96.20]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 3tq2sr8m55-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 13 Oct 2023 14:24:11 +0000 Received: from nalasex01a.na.qualcomm.com (nalasex01a.na.qualcomm.com [10.47.209.196]) by NALASPPMTA04.qualcomm.com (8.17.1.5/8.17.1.5) with ESMTPS id 39DEOAsO025426 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 13 Oct 2023 14:24:10 GMT Received: from hu-jjohnson-lv.qualcomm.com (10.49.16.6) by nalasex01a.na.qualcomm.com (10.47.209.196) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.36; Fri, 13 Oct 2023 07:24:09 -0700 From: Jeff Johnson Date: Fri, 13 Oct 2023 07:24:08 -0700 Subject: [PATCH 1/2] wifi: ath11k: Remove ath11k_base::bd_api MIME-Version: 1.0 Message-ID: <20231013-ath11k_bd_api-v1-1-3fefe4629706@quicinc.com> References: <20231013-ath11k_bd_api-v1-0-3fefe4629706@quicinc.com> In-Reply-To: <20231013-ath11k_bd_api-v1-0-3fefe4629706@quicinc.com> To: Kalle Valo CC: , , , , Jeff Johnson X-Mailer: b4 0.12.3 X-Originating-IP: [10.49.16.6] X-ClientProxiedBy: nalasex01a.na.qualcomm.com (10.47.209.196) To nalasex01a.na.qualcomm.com (10.47.209.196) X-QCInternal: smtphost X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=5800 signatures=585085 X-Proofpoint-GUID: yx679Zmrl0SjBv1A6ybZFuB2iy19ebYa X-Proofpoint-ORIG-GUID: yx679Zmrl0SjBv1A6ybZFuB2iy19ebYa X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.980,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2023-10-13_05,2023-10-12_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 impostorscore=0 adultscore=0 priorityscore=1501 mlxscore=0 mlxlogscore=858 spamscore=0 suspectscore=0 phishscore=0 malwarescore=0 bulkscore=0 lowpriorityscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2309180000 definitions=main-2310130120 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Fri, 13 Oct 2023 07:24:45 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1779650617798901123 X-GMAIL-MSGID: 1779650617798901123 Currently struct ath11k_base defines the member bd_api. However, this member is only accessed within ath11k_core_fetch_bdf(). Since the scope is local just to that one function, remove it from ath11k_base and instead just use a local stack variable. No functional changes, compile tested only. Signed-off-by: Jeff Johnson --- drivers/net/wireless/ath/ath11k/core.c | 7 ++++--- drivers/net/wireless/ath/ath11k/core.h | 1 - 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/net/wireless/ath/ath11k/core.c b/drivers/net/wireless/ath/ath11k/core.c index c3a0dd15d8ea..1469ab4a2df9 100644 --- a/drivers/net/wireless/ath/ath11k/core.c +++ b/drivers/net/wireless/ath/ath11k/core.c @@ -1317,6 +1317,7 @@ int ath11k_core_fetch_bdf(struct ath11k_base *ab, struct ath11k_board_data *bd) { char *boardname = NULL, *fallback_boardname = NULL, *chip_id_boardname = NULL; char *filename, filepath[100]; + int bd_api; int ret = 0; filename = ATH11K_BOARD_API2_FILE; @@ -1332,7 +1333,7 @@ int ath11k_core_fetch_bdf(struct ath11k_base *ab, struct ath11k_board_data *bd) goto exit; } - ab->bd_api = 2; + bd_api = 2; ret = ath11k_core_fetch_board_data_api_n(ab, bd, boardname, ATH11K_BD_IE_BOARD, ATH11K_BD_IE_BOARD_NAME, @@ -1381,7 +1382,7 @@ int ath11k_core_fetch_bdf(struct ath11k_base *ab, struct ath11k_board_data *bd) if (!ret) goto exit; - ab->bd_api = 1; + bd_api = 1; ret = ath11k_core_fetch_board_data_api_1(ab, bd, ATH11K_DEFAULT_BOARD_FILE); if (ret) { ath11k_core_create_firmware_path(ab, filename, @@ -1405,7 +1406,7 @@ int ath11k_core_fetch_bdf(struct ath11k_base *ab, struct ath11k_board_data *bd) kfree(chip_id_boardname); if (!ret) - ath11k_dbg(ab, ATH11K_DBG_BOOT, "using board api %d\n", ab->bd_api); + ath11k_dbg(ab, ATH11K_DBG_BOOT, "using board api %d\n", bd_api); return ret; } diff --git a/drivers/net/wireless/ath/ath11k/core.h b/drivers/net/wireless/ath/ath11k/core.h index 650972f9d146..f4e8b3b9ed4d 100644 --- a/drivers/net/wireless/ath/ath11k/core.h +++ b/drivers/net/wireless/ath/ath11k/core.h @@ -906,7 +906,6 @@ struct ath11k_base { struct ath11k_targ_cap target_caps; u32 ext_service_bitmap[WMI_SERVICE_EXT_BM_SIZE]; bool pdevs_macaddr_valid; - int bd_api; struct ath11k_hw_params hw_params;