From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.5 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, UNWANTED_LANGUAGE_BODY,USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5B5EEC433B4 for ; Tue, 6 Apr 2021 12:37:06 +0000 (UTC) Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id E1980613BD for ; Tue, 6 Apr 2021 12:37:05 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E1980613BD Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=desiato.20200630; h=Sender:Content-Transfer-Encoding :Content-Type:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References:Message-ID: Subject:Cc:To:From:Date:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=XYkD8tEaNv0NhaQM0Soj3r/IWCcz9Hmlr6UtGeeHKIA=; b=ExgGFkZrI7m3bVuy+xDL4owKO jeRYy7DwxczE388VgmZHemCSOriGUnDW9RVU6AEJhamoHrxfni1Tglb5UegSzjyR3CMZT/3Q4KVb4 vDZyZwMfublPjgSBHSZzK/Xhq3C8B7blUHQNDRhsqtEGqjXDUd0BOpU3KLGjiB9tg4xL/Spd5SOl9 Qs8sE0yd4yKAU8cB94FvrZAfrduAp1cx+E9DyzOZYZpwv0L03Ntm8fYlbylCU8R/O/9R2ZxlIP408 MtjaqUEi60xhhZxfbJ30iO2hIUKX5PicUZ6ktOkeF0jJ94AEKfiEM3QQacCdJrzbkJVMgCtMdbDht 6UeoX6H3A==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lTkuZ-002c4j-8Z; Tue, 06 Apr 2021 12:34:27 +0000 Received: from mga01.intel.com ([192.55.52.88]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lTkuS-002c46-U5 for linux-arm-kernel@lists.infradead.org; Tue, 06 Apr 2021 12:34:25 +0000 IronPort-SDR: gk74dBPrfq4G61DprNl8Vd09sPK1BxVS05NQbRK6BnLFvDx4Tof9tWHdHbojoLWjT3pj4xEptw Lcj/2rh3LreA== X-IronPort-AV: E=McAfee;i="6000,8403,9946"; a="213415431" X-IronPort-AV: E=Sophos;i="5.81,309,1610438400"; d="scan'208";a="213415431" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Apr 2021 05:34:16 -0700 IronPort-SDR: LFu5Mitpm//InF7yS6omjqR+EmE8KVBTozwQVYSyM8bRI4ShGnLFyZEXMqcV+OC2Wo6Utn5xSf JPhLci5i5LvA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.81,309,1610438400"; d="scan'208";a="457871836" Received: from linux.intel.com ([10.54.29.200]) by orsmga001.jf.intel.com with ESMTP; 06 Apr 2021 05:34:11 -0700 Received: from linux.intel.com (unknown [10.88.229.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by linux.intel.com (Postfix) with ESMTPS id DCDDD5805A1; Tue, 6 Apr 2021 05:34:08 -0700 (PDT) Date: Tue, 6 Apr 2021 20:33:58 +0800 From: Wong Vee Khee To: Andy Shevchenko Cc: "David S. Miller" , netdev@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Giuseppe Cavallaro , Alexandre Torgue , Jose Abreu , Jakub Kicinski , Maxime Coquelin Subject: Re: [PATCH net-next v1 1/1] stmmac: intel: Drop duplicate ID in the list of PCI device IDs Message-ID: <20210406123358.GA14588@linux.intel.com> References: <20210406101306.59162-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20210406101306.59162-1-andriy.shevchenko@linux.intel.com> User-Agent: Mutt/1.5.24 (2015-08-30) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210406_133421_328467_E0D56ADF X-CRM114-Status: GOOD ( 23.24 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Tue, Apr 06, 2021 at 01:13:06PM +0300, Andy Shevchenko wrote: > The PCI device IDs are defined with a prefix PCI_DEVICE_ID. > There is no need to repeat the ID part at the end of each definition. > > Signed-off-by: Andy Shevchenko Reviewed-by: Wong Vee Khee > --- > .../net/ethernet/stmicro/stmmac/dwmac-intel.c | 60 +++++++++---------- > 1 file changed, 30 insertions(+), 30 deletions(-) > > diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c > index 3d9a57043af2..7f0ce373a63d 100644 > --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c > +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c > @@ -1053,41 +1053,41 @@ static int __maybe_unused intel_eth_pci_resume(struct device *dev) > static SIMPLE_DEV_PM_OPS(intel_eth_pm_ops, intel_eth_pci_suspend, > intel_eth_pci_resume); > > -#define PCI_DEVICE_ID_INTEL_QUARK_ID 0x0937 > -#define PCI_DEVICE_ID_INTEL_EHL_RGMII1G_ID 0x4b30 > -#define PCI_DEVICE_ID_INTEL_EHL_SGMII1G_ID 0x4b31 > -#define PCI_DEVICE_ID_INTEL_EHL_SGMII2G5_ID 0x4b32 > +#define PCI_DEVICE_ID_INTEL_QUARK 0x0937 > +#define PCI_DEVICE_ID_INTEL_EHL_RGMII1G 0x4b30 > +#define PCI_DEVICE_ID_INTEL_EHL_SGMII1G 0x4b31 > +#define PCI_DEVICE_ID_INTEL_EHL_SGMII2G5 0x4b32 > /* Intel(R) Programmable Services Engine (Intel(R) PSE) consist of 2 MAC > * which are named PSE0 and PSE1 > */ > -#define PCI_DEVICE_ID_INTEL_EHL_PSE0_RGMII1G_ID 0x4ba0 > -#define PCI_DEVICE_ID_INTEL_EHL_PSE0_SGMII1G_ID 0x4ba1 > -#define PCI_DEVICE_ID_INTEL_EHL_PSE0_SGMII2G5_ID 0x4ba2 > -#define PCI_DEVICE_ID_INTEL_EHL_PSE1_RGMII1G_ID 0x4bb0 > -#define PCI_DEVICE_ID_INTEL_EHL_PSE1_SGMII1G_ID 0x4bb1 > -#define PCI_DEVICE_ID_INTEL_EHL_PSE1_SGMII2G5_ID 0x4bb2 > -#define PCI_DEVICE_ID_INTEL_TGLH_SGMII1G_0_ID 0x43ac > -#define PCI_DEVICE_ID_INTEL_TGLH_SGMII1G_1_ID 0x43a2 > -#define PCI_DEVICE_ID_INTEL_TGL_SGMII1G_ID 0xa0ac > -#define PCI_DEVICE_ID_INTEL_ADLS_SGMII1G_0_ID 0x7aac > -#define PCI_DEVICE_ID_INTEL_ADLS_SGMII1G_1_ID 0x7aad > +#define PCI_DEVICE_ID_INTEL_EHL_PSE0_RGMII1G 0x4ba0 > +#define PCI_DEVICE_ID_INTEL_EHL_PSE0_SGMII1G 0x4ba1 > +#define PCI_DEVICE_ID_INTEL_EHL_PSE0_SGMII2G5 0x4ba2 > +#define PCI_DEVICE_ID_INTEL_EHL_PSE1_RGMII1G 0x4bb0 > +#define PCI_DEVICE_ID_INTEL_EHL_PSE1_SGMII1G 0x4bb1 > +#define PCI_DEVICE_ID_INTEL_EHL_PSE1_SGMII2G5 0x4bb2 > +#define PCI_DEVICE_ID_INTEL_TGLH_SGMII1G_0 0x43ac > +#define PCI_DEVICE_ID_INTEL_TGLH_SGMII1G_1 0x43a2 > +#define PCI_DEVICE_ID_INTEL_TGL_SGMII1G 0xa0ac > +#define PCI_DEVICE_ID_INTEL_ADLS_SGMII1G_0 0x7aac > +#define PCI_DEVICE_ID_INTEL_ADLS_SGMII1G_1 0x7aad > > static const struct pci_device_id intel_eth_pci_id_table[] = { > - { PCI_DEVICE_DATA(INTEL, QUARK_ID, &quark_info) }, > - { PCI_DEVICE_DATA(INTEL, EHL_RGMII1G_ID, &ehl_rgmii1g_info) }, > - { PCI_DEVICE_DATA(INTEL, EHL_SGMII1G_ID, &ehl_sgmii1g_info) }, > - { PCI_DEVICE_DATA(INTEL, EHL_SGMII2G5_ID, &ehl_sgmii1g_info) }, > - { PCI_DEVICE_DATA(INTEL, EHL_PSE0_RGMII1G_ID, &ehl_pse0_rgmii1g_info) }, > - { PCI_DEVICE_DATA(INTEL, EHL_PSE0_SGMII1G_ID, &ehl_pse0_sgmii1g_info) }, > - { PCI_DEVICE_DATA(INTEL, EHL_PSE0_SGMII2G5_ID, &ehl_pse0_sgmii1g_info) }, > - { PCI_DEVICE_DATA(INTEL, EHL_PSE1_RGMII1G_ID, &ehl_pse1_rgmii1g_info) }, > - { PCI_DEVICE_DATA(INTEL, EHL_PSE1_SGMII1G_ID, &ehl_pse1_sgmii1g_info) }, > - { PCI_DEVICE_DATA(INTEL, EHL_PSE1_SGMII2G5_ID, &ehl_pse1_sgmii1g_info) }, > - { PCI_DEVICE_DATA(INTEL, TGL_SGMII1G_ID, &tgl_sgmii1g_phy0_info) }, > - { PCI_DEVICE_DATA(INTEL, TGLH_SGMII1G_0_ID, &tgl_sgmii1g_phy0_info) }, > - { PCI_DEVICE_DATA(INTEL, TGLH_SGMII1G_1_ID, &tgl_sgmii1g_phy1_info) }, > - { PCI_DEVICE_DATA(INTEL, ADLS_SGMII1G_0_ID, &adls_sgmii1g_phy0_info) }, > - { PCI_DEVICE_DATA(INTEL, ADLS_SGMII1G_1_ID, &adls_sgmii1g_phy1_info) }, > + { PCI_DEVICE_DATA(INTEL, QUARK, &quark_info) }, > + { PCI_DEVICE_DATA(INTEL, EHL_RGMII1G, &ehl_rgmii1g_info) }, > + { PCI_DEVICE_DATA(INTEL, EHL_SGMII1G, &ehl_sgmii1g_info) }, > + { PCI_DEVICE_DATA(INTEL, EHL_SGMII2G5, &ehl_sgmii1g_info) }, > + { PCI_DEVICE_DATA(INTEL, EHL_PSE0_RGMII1G, &ehl_pse0_rgmii1g_info) }, > + { PCI_DEVICE_DATA(INTEL, EHL_PSE0_SGMII1G, &ehl_pse0_sgmii1g_info) }, > + { PCI_DEVICE_DATA(INTEL, EHL_PSE0_SGMII2G5, &ehl_pse0_sgmii1g_info) }, > + { PCI_DEVICE_DATA(INTEL, EHL_PSE1_RGMII1G, &ehl_pse1_rgmii1g_info) }, > + { PCI_DEVICE_DATA(INTEL, EHL_PSE1_SGMII1G, &ehl_pse1_sgmii1g_info) }, > + { PCI_DEVICE_DATA(INTEL, EHL_PSE1_SGMII2G5, &ehl_pse1_sgmii1g_info) }, > + { PCI_DEVICE_DATA(INTEL, TGL_SGMII1G, &tgl_sgmii1g_phy0_info) }, > + { PCI_DEVICE_DATA(INTEL, TGLH_SGMII1G_0, &tgl_sgmii1g_phy0_info) }, > + { PCI_DEVICE_DATA(INTEL, TGLH_SGMII1G_1, &tgl_sgmii1g_phy1_info) }, > + { PCI_DEVICE_DATA(INTEL, ADLS_SGMII1G_0, &adls_sgmii1g_phy0_info) }, > + { PCI_DEVICE_DATA(INTEL, ADLS_SGMII1G_1, &adls_sgmii1g_phy1_info) }, > {} > }; > MODULE_DEVICE_TABLE(pci, intel_eth_pci_id_table); > -- > 2.30.2 > > > _______________________________________________ > linux-arm-kernel mailing list > linux-arm-kernel@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel