From patchwork Wed Mar 15 09:18:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mengyuan Lou X-Patchwork-Id: 13175532 X-Patchwork-Delegate: kuba@kernel.org 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 D9B74C6FD1D for ; Wed, 15 Mar 2023 09:19:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231701AbjCOJTg (ORCPT ); Wed, 15 Mar 2023 05:19:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45478 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231671AbjCOJT1 (ORCPT ); Wed, 15 Mar 2023 05:19:27 -0400 Received: from smtpbg156.qq.com (smtpbg156.qq.com [15.184.82.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 95170136F9 for ; Wed, 15 Mar 2023 02:19:21 -0700 (PDT) X-QQ-mid: bizesmtp63t1678871952t12lwias Received: from localhost.localdomain ( [183.129.236.74]) by bizesmtp.qq.com (ESMTP) with id ; Wed, 15 Mar 2023 17:18:49 +0800 (CST) X-QQ-SSF: 01400000000000N0P000000A0000000 X-QQ-FEAT: W+onFc5Tw4M0etWcp/WqPr1K2c10p3+dsQGV3QP1Zte1IVVBq4BI7bEqBLkcj 2MA9gg7WMWQtwluQISmP3oPFV4pFYYnx25gpOllpbEmGDUJTOOiWFXVeSjcwtad9pf3A3mk gKI9i68FWw/gAeQlD84lDfYCsbn5fA0oUm9ifHgSCvF5Z8aJP/12gUtZr0e2bcYEhvMsAGU /ajYqc8j4BCdSM1Js4MsrQADCEvzGWB01xsQml/tq+rEuLwIlUXVjWxrihJ7WYGx2wFD3n0 8REOpGrs/+3Ln+2OVFzgw21tibJgLltVYUE5dxBeh2RJhlfyOqOT9zsx7iUi6DIub5butnw c5RFnGN3w9nItM1XdRuxXB9XHqdZbmPCwR5l8JtkVOYPVQffofXp986ZlS0X4wQS8TiHimv 63IN5S/aKZrTkh5Spffu5g== X-QQ-GoodBg: 2 From: mengyuanlou To: netdev@vger.kernel.org Cc: jiawenwu@trustnetic.com, mengyuanlou Subject: [PATCH net-next] net: wangxun: Remove macro that is redefined Date: Wed, 15 Mar 2023 17:18:46 +0800 Message-Id: <20230315091846.17314-1-mengyuanlou@net-swift.com> X-Mailer: git-send-email 2.40.0 MIME-Version: 1.0 X-QQ-SENDSIZE: 520 Feedback-ID: bizesmtp:net-swift.com:qybglogicsvr:qybglogicsvr1 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org Remove PCI_VENDOR_ID_WANGXUN which is redefined in drivers/pci/quirks. Signed-off-by: mengyuanlou --- drivers/net/ethernet/wangxun/libwx/wx_type.h | 5 ----- 1 file changed, 5 deletions(-) diff --git a/drivers/net/ethernet/wangxun/libwx/wx_type.h b/drivers/net/ethernet/wangxun/libwx/wx_type.h index 2b9efd13c500..2bec5b1bc196 100644 --- a/drivers/net/ethernet/wangxun/libwx/wx_type.h +++ b/drivers/net/ethernet/wangxun/libwx/wx_type.h @@ -7,11 +7,6 @@ #include #include -/* Vendor ID */ -#ifndef PCI_VENDOR_ID_WANGXUN -#define PCI_VENDOR_ID_WANGXUN 0x8088 -#endif - #define WX_NCSI_SUP 0x8000 #define WX_NCSI_MASK 0x8000 #define WX_WOL_SUP 0x4000