Received: by 2002:a05:6358:7058:b0:131:369:b2a3 with SMTP id 24csp9383120rwp; Thu, 20 Jul 2023 04:16:16 -0700 (PDT) X-Google-Smtp-Source: APBJJlF+BaZRHZCqnQqi/9DiCoFKucBQRSbmFY5WMvI19+jHs18HIesyUUUws/wTMiMaXuQamVp0 X-Received: by 2002:a17:90a:d501:b0:267:7d17:9d62 with SMTP id t1-20020a17090ad50100b002677d179d62mr6097030pju.15.1689851776564; Thu, 20 Jul 2023 04:16:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689851776; cv=none; d=google.com; s=arc-20160816; b=BLolCt6gBkTagat7Cj/g0wr+BKRxstPphlPcBzHjIWa4JriPk67dSdg7LpvrH0q0z3 6haxjRex5LVaYEp4B/uJ9BrFxMvS6lvIeKXHDOqzSWYZ25yMHeeaflkQi8SxsBSE6N5z 96ZlMqKCj0zw1i+2F7H6lM9M7lQl1cPVXEZN3Qw7jBGvsAIV0XeRs1COh36phX6Am43n SFdnD7c7wx3isW1C+VLtFmW7O6FFV31kXK9s8IMU+f7F8gPl+4JMRD/Kf7r8T1E5R0KA V3YiEzKvVvgfRA6obfWqcGJbHJIaL/CvTEyM7rGJYpM7zdRCFOFMRC3zMxrESu2D3H40 0tAg== 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=hGNs7eYabmIox/tslN8jioJ62MoxzG/WjF7agc3MTUI=; fh=baSBWN/tlYWxbpZvHmbkoLq51LtcBnynNpuz0eV0qdE=; b=s5k2ikGTxmppKNK5rDevJ+C1jSwBx/RoBNKRrvaanjmz71Fs7J0YVfjIadlSfNIF7H 5UHykPIbYlTsckkf4JQPutTqu/UJA3UCLlOi/fkWl0xVpCBHLIBwlvVNoHhPEfw3Hxbo Dd8s4dg4JWBkvYv/9MQh5z/OQbKgrzlDNgyHSdx+GDukhjX+C4sn4/i/iM5xVbWgTqBo ePKE5T+AMp4uuKMxXMdCKLqsz4ITe6BNWdMjxh9bQDs8OfQX/mDADoa5DMKkL79zgLlu LyxsySHrejQKbzkMHePyaMy7DxKR+2xJogP3lJbj4evq0QaErBxGYT+Jv+4tMdUBrHqA leLw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=gEMCVHLw; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id m2-20020a17090a414200b002676bf94cc4si3254141pjg.134.2023.07.20.04.16.04; Thu, 20 Jul 2023 04:16:16 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=gEMCVHLw; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231342AbjGTK3a (ORCPT + 99 others); Thu, 20 Jul 2023 06:29:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35846 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231328AbjGTK31 (ORCPT ); Thu, 20 Jul 2023 06:29:27 -0400 Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2CD0610F1; Thu, 20 Jul 2023 03:29:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1689848967; x=1721384967; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=kTWJSHEGb9T1ca2QtFopdPGbNjP780uh5D0zf+cKSP4=; b=gEMCVHLwG9dFbz2J98dcj7EGDrj64yCpaAyLGAs1zTuFZIJnw/PCyiBX OwuXdxCEsM1sVfReHVRyi97oGPE09LDuiAAxWcvnHr4mX4YcU3TtfInR4 Ecv5i46CSyacrwtAw/cFEEin3F3aQOHGIDf0KKCQFDHsUfE/OROlFedNb cHIjqZhaWgddsjEw9/sTaxSbXsZsm/aOdUkJTaHDQwtWI3vTFXByPQZs/ buHZe/3GmYaxDWqvXu1k4mIsa1gGwUOQNug8AzEOoGsiU5po5m0UojCXu p3J9Aocf7k2u6bEktCcd1drqa77I9KVrxvJXt8kyyZ9CGODsZ/LbduND9 w==; X-IronPort-AV: E=McAfee;i="6600,9927,10776"; a="370261360" X-IronPort-AV: E=Sophos;i="6.01,218,1684825200"; d="scan'208";a="370261360" Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Jul 2023 03:29:26 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10776"; a="727636707" X-IronPort-AV: E=Sophos;i="6.01,218,1684825200"; d="scan'208";a="727636707" Received: from unknown (HELO jiaqingz-acrn-container.sh.intel.com) ([10.239.138.235]) by fmsmga007-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Jul 2023 03:29:24 -0700 From: Jiaqing Zhao To: Wolfgang Grandegger , Marc Kleine-Budde Cc: Gerhard Uttenthaler , support@ems-wuensche.com, Andy Shevchenko , linux-can@vger.kernel.org, linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, Jiaqing Zhao Subject: [PATCH v2 1/2] can: ems_pci: remove PCI_SUBVENDOR_ID_ASIX definition Date: Thu, 20 Jul 2023 10:28:58 +0000 Message-Id: <20230720102859.2985655-2-jiaqing.zhao@linux.intel.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230720102859.2985655-1-jiaqing.zhao@linux.intel.com> References: <20230720102859.2985655-1-jiaqing.zhao@linux.intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE 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 PCI_SUBVENDOR_ID_ASIX is defined as 0xa000, which is not the vendor id assigned to ASIX by PCI-SIG. Remove it to avoid possible confusion and conflict. Signed-off-by: Jiaqing Zhao Reviewed-by: Andy Shevchenko --- drivers/net/can/sja1000/ems_pci.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/net/can/sja1000/ems_pci.c b/drivers/net/can/sja1000/ems_pci.c index c56e27223e5f..3e18c63a982c 100644 --- a/drivers/net/can/sja1000/ems_pci.c +++ b/drivers/net/can/sja1000/ems_pci.c @@ -111,7 +111,6 @@ struct ems_pci_card { #ifndef PCI_VENDOR_ID_ASIX #define PCI_VENDOR_ID_ASIX 0x125b #define PCI_DEVICE_ID_ASIX_9110 0x9110 -#define PCI_SUBVENDOR_ID_ASIX 0xa000 #endif #define PCI_SUBDEVICE_ID_EMS 0x4010 @@ -123,7 +122,7 @@ static const struct pci_device_id ems_pci_tbl[] = { /* CPC-104P v2 */ {PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_9030, PCI_VENDOR_ID_PLX, 0x4002}, /* CPC-PCIe v3 */ - {PCI_VENDOR_ID_ASIX, PCI_DEVICE_ID_ASIX_9110, PCI_SUBVENDOR_ID_ASIX, PCI_SUBDEVICE_ID_EMS}, + {PCI_VENDOR_ID_ASIX, PCI_DEVICE_ID_ASIX_9110, 0xa000, PCI_SUBDEVICE_ID_EMS}, {0,} }; MODULE_DEVICE_TABLE(pci, ems_pci_tbl); -- 2.39.2