From patchwork Thu Sep 14 20:44:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Skvortsov X-Patchwork-Id: 140186 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:172:b0:3f2:4152:657d with SMTP id h50csp876462vqi; Fri, 15 Sep 2023 00:55:57 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHkCWxbVxfzzbkpcPln7VpWPQMbXSZD9zlQzgE+5s7TDIq2D0hDd392TTpR7dvkj8Qra65N X-Received: by 2002:a05:6a20:5489:b0:14d:9938:735f with SMTP id i9-20020a056a20548900b0014d9938735fmr1285872pzk.17.1694764557477; Fri, 15 Sep 2023 00:55:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694764557; cv=none; d=google.com; s=arc-20160816; b=aiPLqXA1h0llNKK97z7j/BZI35XpMhXPUlTRrtbN8Y3g+ZmHG/O6pdzK7u5jXlnHv4 dqbZgHPwJi1YZugq+cW78gPXTTamCaA+ZnqnPLP3eNtTBWTK/PfWcEgCkAH9XHOv724x D3KJ19RtRBNrcOY0EBpXILJ5qf72NVl6t1xu3DEgBVvBOY/qB0irhTZM69d6tcjsNkgG 1QXUARJPZVD67xIF1bboOkpw0BL7zn7BQpuzsWfBFmi/LtUS4mcZrg4EnY2tIiE1mKYL +nHuMoT3WQLKmKqDG8DGKGvJclo2CnmfeF2jo24WYkCZhGgj8rxN6D4I15qXVf4O3oiG FoiQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=hGJpt2wJkIR4MQJAzc96tFmQzqc/CQBVOhIv8wDwAYE=; fh=81KkP0fH8WX/FICP9Din0PNcpO45uhLeFHTUDvyuOV8=; b=sZmSoVSA/d7m19dfBm4xwURE9vbrdw7XrTwLEV+kWp7UoFr3ogMgznYJPsbAxLtaoN 6MT4taJTGdXZucwq5uyRZVtqZ4IgQlRVK9tZVGsOC9k0p/BCMevltEYdMstfbX6l0m+F JTly3M5cS/Ouflac3YjnRcx0btJhS7qD5ZABwujoM2AtmRqQcdw+06kWA0wkWlsiPc4h 7rMfx5+ipsmpozttYrPhle0n1OVOgYNDr6Qz2zxSO0tAyxS76c1IlD0D4mW8ZR6l7Y1F 7EzBfaZokwCImcqpzwICJnu12azQcW9W1KI1kNtpMUQA23O9axVITeGZvYeF3n/iu9Uk suAQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20221208 header.b=ruPE46ib; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id t12-20020a1709027fcc00b001b89bd6fd59si2862916plb.215.2023.09.15.00.55.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Sep 2023 00:55:57 -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=@gmail.com header.s=20221208 header.b=ruPE46ib; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id F3E33813CD9F; Thu, 14 Sep 2023 13:44:50 -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 S229654AbjINUom (ORCPT + 33 others); Thu, 14 Sep 2023 16:44:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44460 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229473AbjINUol (ORCPT ); Thu, 14 Sep 2023 16:44:41 -0400 Received: from mail-lj1-x22e.google.com (mail-lj1-x22e.google.com [IPv6:2a00:1450:4864:20::22e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 03CB42120; Thu, 14 Sep 2023 13:44:37 -0700 (PDT) Received: by mail-lj1-x22e.google.com with SMTP id 38308e7fff4ca-2bfb17435e4so22512061fa.0; Thu, 14 Sep 2023 13:44:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1694724275; x=1695329075; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=hGJpt2wJkIR4MQJAzc96tFmQzqc/CQBVOhIv8wDwAYE=; b=ruPE46ibVme2AXEW7PXuvSASUTj6essHetQQJr7sDYMXJV2yFO+MEWvu9oYhn/jn6/ uxbsDhuh3FFHZ7xtIL5QnoXd3KWk35JknbvaF0UrZwsIJ/mloXKYkUDxgPFqZrfDvsDW 9uPg+cGIiQ90uo4qAGdyXPBZcbMXtOXBnKL7eSm6ryCTsyTvc8sxl1iPE1flVz6wubQ4 BUKLfIMQYVnhzFSbtVyljJsEp5cAxKlPEjD3moY23oMcFtkmi4M7QI9hk5tkpNHRx021 jcuI5KYKQ9RBBK64m0Mj53msMmJdO7H2QFApj91NfyAWq0EF3FTpkkGtAsaNQJLf0RtU 3Cig== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694724275; x=1695329075; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=hGJpt2wJkIR4MQJAzc96tFmQzqc/CQBVOhIv8wDwAYE=; b=aw0ah4nwwk9bIiuhr6HlldJMxN+mjgkS3YuhQNZS91ZB8SP8syfFksfmNeIOv4252g LQqg3Y1Xw3qgscRvRYPwgOTAQGwZF72DGy33a6Jns53yswIda/8y2VYs31DOBGqYaNb7 jbdPp6QlXaW+d3OBjdztsLn3II0riYZUVLDmcq6OqlUvE0fyXaZcLtw5UhQS4e57q9cZ XMB6i+qcC/Jt6agCdBUDpnGOxkzXD31QxoMpYaUiNoJauQylo/utaqZbig1PKw6BNnHS yMAR3Ay55+Lt31mr505vA9mqpQL3qBHYI/gn3OOILzqd1a1jWB3wtdBXi2NfDP4N4wOs 2/iA== X-Gm-Message-State: AOJu0YzFBvdDoqWC2OSiCiKBonwEfwC9+ZBNnlZCbe2mBx6BvTSx7yno w/5EFAtUTFSXKGkGeSZgSyEME8zkJmGzznc+ X-Received: by 2002:a05:6512:3e0a:b0:4f8:e4e9:499e with SMTP id i10-20020a0565123e0a00b004f8e4e9499emr6230360lfv.12.1694724274569; Thu, 14 Sep 2023 13:44:34 -0700 (PDT) Received: from localhost.localdomain ([2a05:3580:f312:6c00:826c:ae47:61a7:8af8]) by smtp.gmail.com with ESMTPSA id a28-20020ac2521c000000b005008cd93961sm396848lfl.192.2023.09.14.13.44.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Sep 2023 13:44:34 -0700 (PDT) From: Andrey Skvortsov To: Marcel Holtmann , Johan Hedberg , Luiz Augusto von Dentz , linux-bluetooth@vger.kernel.org, linux-kernel@vger.kernel.org, Hilda Wu , Max Chou Cc: Andrey Skvortsov Subject: [PATCH] Bluetooth: btrtl: reuse define enumeration values Date: Thu, 14 Sep 2023 23:44:04 +0300 Message-Id: <20230914204404.1253141-1-andrej.skvortzov@gmail.com> X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 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]); Thu, 14 Sep 2023 13:44:51 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777089440729145186 X-GMAIL-MSGID: 1777089440729145186 rtlbt_parse_firmware function sets project_id defined like unnamed integer constant. But later in the code (btrtl_set_quirks) project_id is compared against values in btrtl_chip_id enumeration. Signed-off-by: Andrey Skvortsov --- drivers/bluetooth/btrtl.c | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/drivers/bluetooth/btrtl.c b/drivers/bluetooth/btrtl.c index 84c2c2e1122f..018d86410b88 100644 --- a/drivers/bluetooth/btrtl.c +++ b/drivers/bluetooth/btrtl.c @@ -60,7 +60,8 @@ enum btrtl_chip_id { CHIP_ID_8723B, CHIP_ID_8821A, CHIP_ID_8761A, - CHIP_ID_8822B = 8, + CHIP_ID_8703B = 7, + CHIP_ID_8822B, CHIP_ID_8723D, CHIP_ID_8821C, CHIP_ID_8822C = 13, @@ -631,20 +632,20 @@ static int rtlbt_parse_firmware(struct hci_dev *hdev, __u16 lmp_subver; __u8 id; } project_id_to_lmp_subver[] = { - { RTL_ROM_LMP_8723A, 0 }, - { RTL_ROM_LMP_8723B, 1 }, - { RTL_ROM_LMP_8821A, 2 }, - { RTL_ROM_LMP_8761A, 3 }, - { RTL_ROM_LMP_8703B, 7 }, - { RTL_ROM_LMP_8822B, 8 }, - { RTL_ROM_LMP_8723B, 9 }, /* 8723D */ - { RTL_ROM_LMP_8821A, 10 }, /* 8821C */ - { RTL_ROM_LMP_8822B, 13 }, /* 8822C */ - { RTL_ROM_LMP_8761A, 14 }, /* 8761B */ - { RTL_ROM_LMP_8852A, 18 }, /* 8852A */ - { RTL_ROM_LMP_8852A, 20 }, /* 8852B */ - { RTL_ROM_LMP_8852A, 25 }, /* 8852C */ - { RTL_ROM_LMP_8851B, 36 }, /* 8851B */ + { RTL_ROM_LMP_8723A, CHIP_ID_8723A }, + { RTL_ROM_LMP_8723B, CHIP_ID_8723B }, + { RTL_ROM_LMP_8821A, CHIP_ID_8821A }, + { RTL_ROM_LMP_8761A, CHIP_ID_8761A }, + { RTL_ROM_LMP_8703B, CHIP_ID_8703B }, + { RTL_ROM_LMP_8822B, CHIP_ID_8822B }, + { RTL_ROM_LMP_8723B, CHIP_ID_8723D }, + { RTL_ROM_LMP_8821A, CHIP_ID_8821C }, + { RTL_ROM_LMP_8822B, CHIP_ID_8822C }, + { RTL_ROM_LMP_8761A, CHIP_ID_8761B }, + { RTL_ROM_LMP_8852A, CHIP_ID_8852A }, + { RTL_ROM_LMP_8852A, CHIP_ID_8852B }, + { RTL_ROM_LMP_8852A, CHIP_ID_8852C }, + { RTL_ROM_LMP_8851B, CHIP_ID_8851B }, }; if (btrtl_dev->fw_len <= 8)