From patchwork Mon Jul 24 08:39:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiaqing Zhao X-Patchwork-Id: 706092 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 41B3CC001E0 for ; Mon, 24 Jul 2023 08:40:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231698AbjGXIkS (ORCPT ); Mon, 24 Jul 2023 04:40:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37800 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231759AbjGXIkJ (ORCPT ); Mon, 24 Jul 2023 04:40:09 -0400 Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 18E49E53; Mon, 24 Jul 2023 01:40:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1690188002; x=1721724002; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=7XetFSB8w0abNmptL2jZLyIL/EPTDluuPN5UWBbyacE=; b=IdLUMOhySdHSvoObQZECBF6UbFAxItHsOef1U8bTW/o1Zcwh9xDk0Tfc 2Jm3cZcXaGsw2PNQxQV0/JqSqMFJK4rZBye2F1woY+O1fF+pOm8NtkBQn JUkV1vALdoPV2Icq4p2jiooXWVGqIwmQpKw0eqbAeWK4SXNB2zgO7/s4T khZjbyjl2Tr2kn5P62pUu7nsWuxfAHlf+oQFfwg/LmNs2b7R+1tWoXRwz v3Mh4gvrXWeFHxBeLtv18xvrqY8wkgwb5xt3FfLwJa2vMny3ZFBI2SDqA CSKa1EmvUlRxMV14IfGEu9kTALIlLOmfhSONwPyx4mzPyymoEw5PaJxih Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10780"; a="433627626" X-IronPort-AV: E=Sophos;i="6.01,228,1684825200"; d="scan'208";a="433627626" Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Jul 2023 01:40:01 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10780"; a="675749439" X-IronPort-AV: E=Sophos;i="6.01,228,1684825200"; d="scan'208";a="675749439" Received: from unknown (HELO jiaqingz-acrn-container.sh.intel.com) ([10.239.138.235]) by orsmga003-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Jul 2023 01:39:58 -0700 From: Jiaqing Zhao To: Greg Kroah-Hartman , Sudip Mukherjee Cc: Andy Shevchenko , Wolfgang Grandegger , Marc Kleine-Budde , Gerhard Uttenthaler , support@ems-wuensche.com, linux-serial@vger.kernel.org, linux-pci@vger.kernel.org, linux-can@vger.kernel.org, linux-kernel@vger.kernel.org, Jiaqing Zhao Subject: [PATCH v3 1/4] can: ems_pci: remove PCI_SUBVENDOR_ID_ASIX definition Date: Mon, 24 Jul 2023 08:39:30 +0000 Message-Id: <20230724083933.3173513-2-jiaqing.zhao@linux.intel.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230724083933.3173513-1-jiaqing.zhao@linux.intel.com> References: <20230724083933.3173513-1-jiaqing.zhao@linux.intel.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-serial@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 Acked-by: Marc Kleine-Budde --- 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);