From patchwork Fri Nov 24 08:47:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ilpo_J=C3=A4rvinen?= X-Patchwork-Id: 169303 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce62:0:b0:403:3b70:6f57 with SMTP id o2csp1010484vqx; Fri, 24 Nov 2023 00:49:59 -0800 (PST) X-Google-Smtp-Source: AGHT+IFx61s2pge3lzLPgaWC2w2etOMo05iAo1BLJneDOGBZhx5whsN0+vZtYJTVuxtZXBZsTaxy X-Received: by 2002:a05:6a20:144a:b0:18b:4226:5ffa with SMTP id a10-20020a056a20144a00b0018b42265ffamr2251251pzi.15.1700815799145; Fri, 24 Nov 2023 00:49:59 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700815799; cv=none; d=google.com; s=arc-20160816; b=dwwYNVFHgX8E88WuHvR/7Nmw4uYLNghM8DoYdAr6SFv+6xYAOk3v8bS+gcUtARPm4B bAf8LKZDo5+hYPuHRzSVnRoHwMpacv5t+8m+0UKAU419G4o0lyUqXfH+bhvW2trn6iy6 ikHMwk8Ptwcq7Rw+FP1n2aExlcNF72CtVUJFm+J60/r+ahVDLfWUVlw1A8w+ACYRSAvM AyneQ/hhwbux+RI3BvdV9d29VbIEVMYwIhp6rgWA5ppr1YvyPngfMS0FXBFrFH1+uXQR DlHtrj5uVmhYwUK5D0fY+WoPzF58Q5PU1CZTLbjDjCXJ79ZwDR23n9H9LRHp8OAnsyaB wK6g== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=kG/mFjVSl9qwuKdNGHCN1ZTsLdu3iwW03B6qwu5gDKY=; fh=W+eSkce8uvUdQ8A1Dj5F8klEXQy967eJmFo02igvYfU=; b=PSAWmHEH35BmpFSxWVwLUuy5ScMscss7a2iHoEND2mvKx6WP/GkyA+9AyOLBYmOJVr kCOPTkQ7tCLiSQqT+xutGwERDwLr/9MsZrNB5zK8ql0LFTs6udfnymk8S4aLHUKlc/ov KeIT4ceTt795k5ExyRETgCY1Sb1odTDunU+ZF44i5mSGzYzqTa2QVrSUcOAsxGIP3sDe jkpzHFTYRijqgxPZRW8auRnKHmf8aohHqSbj2cT0EY/2J5XESQaHYvB3J8Ad7b4eb6Nx t3RXAwH4WUIHcOhkfreHABkTGB756ODldXt8oLFctSNnDLiYBk8n3PXedFVj+CD9kWsW tspw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=JCF+NMRh; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from howler.vger.email (howler.vger.email. [2620:137:e000::3:4]) by mx.google.com with ESMTPS id j5-20020a170902da8500b001cf6aae59c0si3134722plx.564.2023.11.24.00.49.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Nov 2023 00:49:59 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) client-ip=2620:137:e000::3:4; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=JCF+NMRh; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by howler.vger.email (Postfix) with ESMTP id 1B2C6804BC29; Fri, 24 Nov 2023 00:49:56 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232747AbjKXIt0 (ORCPT + 99 others); Fri, 24 Nov 2023 03:49:26 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41986 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235257AbjKXIsx (ORCPT ); Fri, 24 Nov 2023 03:48:53 -0500 Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.20]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D5DDC10F3; Fri, 24 Nov 2023 00:48:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1700815740; x=1732351740; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=szHP/bH/uBQ0qXbVg2RukeAFWzc2VqyRXvm/T4TFP44=; b=JCF+NMRhrfVTPJ0Eguibm+Fs1pFtxPEKnTminF76/6FdNYihqhz6/isF pbuYmAWFHiRRqrBTJGVXAaI42nut53AyHKz7B3w5zuHLu+eENjHgDzpSq SL6GykA3bz8bPdx4CitDjwqqbhH2iPvynrBjaqbLmvAvkpyNKOG8eIsUs 17Mf42mtq8XwlkJrS3yWSRfrysMXGQqztGGVckgeRxnlTHjYxwdPGlji3 OhOIsiFfbFm8W5r8n99EKStCHFOtrr2bm4pfZzuSMJv+eiNnkc1kNm5QL dcDbU3JscTl/m2nFPvVrF0USOfBxzc4jKgtGbcGDJxWReU5AnLQdQmQNv Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10902"; a="382791767" X-IronPort-AV: E=Sophos;i="6.04,223,1695711600"; d="scan'208";a="382791767" Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Nov 2023 00:48:58 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10902"; a="838026227" X-IronPort-AV: E=Sophos;i="6.04,223,1695711600"; d="scan'208";a="838026227" Received: from mvlasov-mobl1.ger.corp.intel.com (HELO localhost) ([10.251.220.89]) by fmsmga004-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Nov 2023 00:48:56 -0800 From: =?utf-8?q?Ilpo_J=C3=A4rvinen?= To: "John W. Linville" , Kalle Valo , Larry Finger , linux-wireless@vger.kernel.org, Ping-Ke Shih , Bjorn Helgaas , linux-kernel@vger.kernel.org Cc: =?utf-8?q?Ilpo_J=C3=A4rvinen?= Subject: [PATCH v2 10/10] wifi: rtlwifi: Remove bridge vendor/device ids Date: Fri, 24 Nov 2023 10:47:25 +0200 Message-Id: <20231124084725.12738-11-ilpo.jarvinen@linux.intel.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20231124084725.12738-1-ilpo.jarvinen@linux.intel.com> References: <20231124084725.12738-1-ilpo.jarvinen@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on howler.vger.email 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 (howler.vger.email [0.0.0.0]); Fri, 24 Nov 2023 00:49:56 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783434627250230275 X-GMAIL-MSGID: 1783434627250230275 Neither vendorid nor deviceid in the struct mp_adapter is used so remove them. Signed-off-by: Ilpo Järvinen --- drivers/net/wireless/realtek/rtlwifi/pci.c | 1 - drivers/net/wireless/realtek/rtlwifi/pci.h | 2 -- 2 files changed, 3 deletions(-) diff --git a/drivers/net/wireless/realtek/rtlwifi/pci.c b/drivers/net/wireless/realtek/rtlwifi/pci.c index a29d7df6fff5..aa00ee971bc3 100644 --- a/drivers/net/wireless/realtek/rtlwifi/pci.c +++ b/drivers/net/wireless/realtek/rtlwifi/pci.c @@ -1969,7 +1969,6 @@ static bool _rtl_pci_find_adapter(struct pci_dev *pdev, */ if (bridge_pdev) { /*find bridge info if available */ - pcipriv->ndis_adapter.pcibridge_vendorid = bridge_pdev->vendor; for (tmp = 0; tmp < PCI_BRIDGE_VENDOR_MAX; tmp++) { if (bridge_pdev->vendor == pcibridge_vendors[tmp]) { pcipriv->ndis_adapter.pcibridge_vendor = tmp; diff --git a/drivers/net/wireless/realtek/rtlwifi/pci.h b/drivers/net/wireless/realtek/rtlwifi/pci.h index 8bb35506ab1e..616e5ba30d74 100644 --- a/drivers/net/wireless/realtek/rtlwifi/pci.h +++ b/drivers/net/wireless/realtek/rtlwifi/pci.h @@ -216,8 +216,6 @@ struct mp_adapter { u8 pcibridge_funcnum; u8 pcibridge_vendor; - u16 pcibridge_vendorid; - u16 pcibridge_deviceid; bool amd_l1_patch; };