From patchwork Thu Sep 8 22:05:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Easwar Hariharan X-Patchwork-Id: 12970725 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 EBF74C54EE9 for ; Thu, 8 Sep 2022 22:06:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229727AbiIHWGN (ORCPT ); Thu, 8 Sep 2022 18:06:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41182 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229636AbiIHWGL (ORCPT ); Thu, 8 Sep 2022 18:06:11 -0400 Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id E27B3A3469; Thu, 8 Sep 2022 15:06:10 -0700 (PDT) Received: from linuxonhyperv3.guj3yctzbm1etfxqx2vob5hsef.xx.internal.cloudapp.net (linux.microsoft.com [13.77.154.182]) by linux.microsoft.com (Postfix) with ESMTPSA id 9CF5C20B929C; Thu, 8 Sep 2022 15:06:10 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 9CF5C20B929C DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1662674770; bh=ch/5/cm2aut8sVA7LsCY7bS7GtYymUIOxpzSvQK1PWQ=; h=From:To:Subject:Date:In-Reply-To:References:From; b=jCCnNfQVhM9/unHCtZWNTvR6KP1h6I7SWG0furjlcpc0QvmkyMA/i9FMRrrJGlq2U yZCSJ5Uvy8rukE5Fhip0TtfdoqDakhHDhqFlRI9WcBbvz1N4f+A6Oco0caqQZgxk4M nLS9KdKZ22JVd4K1KQfse+l0e5d5toqAlbllDCVk= From: eahariha@linux.microsoft.com To: Deepak Rawat , David Airlie , Daniel Vetter , "K. Y. Srinivasan" , Haiyang Zhang , Stephen Hemminger , Wei Liu , Dexuan Cui , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Helge Deller , Bjorn Helgaas , Easwar Hariharan , Colin Ian King , "Gustavo A. R. Silva" , linux-hyperv@vger.kernel.org (open list:DRM DRIVER FOR HYPERV SYNTHETIC VIDEO DEVICE), dri-devel@lists.freedesktop.org (open list:DRM DRIVER FOR HYPERV SYNTHETIC VIDEO DEVICE), linux-kernel@vger.kernel.org (open list), netdev@vger.kernel.org (open list:NETWORKING DRIVERS), linux-fbdev@vger.kernel.org (open list:FRAMEBUFFER LAYER), linux-pci@vger.kernel.org (open list:PCI SUBSYSTEM) Subject: [PATCH 2/3] pci_ids: Add Microsoft PCI Vendor ID, and remove redundant definitions Date: Thu, 8 Sep 2022 15:05:56 -0700 Message-Id: <1662674757-31945-2-git-send-email-eahariha@linux.microsoft.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1662674757-31945-1-git-send-email-eahariha@linux.microsoft.com> References: <1662674757-31945-1-git-send-email-eahariha@linux.microsoft.com> Precedence: bulk List-ID: X-Mailing-List: linux-fbdev@vger.kernel.org From: Easwar Hariharan Move the Microsoft PCI Vendor ID from the various drivers to the pci_ids file Signed-off-by: Easwar Hariharan --- drivers/gpu/drm/hyperv/hyperv_drm_drv.c | 1 - drivers/net/ethernet/microsoft/mana/gdma_main.c | 4 ---- drivers/video/fbdev/hyperv_fb.c | 3 --- include/linux/pci_ids.h | 2 ++ 4 files changed, 2 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/drm/hyperv/hyperv_drm_drv.c b/drivers/gpu/drm/hyperv/hyperv_drm_drv.c index 6d11e79..61083c7 100644 --- a/drivers/gpu/drm/hyperv/hyperv_drm_drv.c +++ b/drivers/gpu/drm/hyperv/hyperv_drm_drv.c @@ -23,7 +23,6 @@ #define DRIVER_MAJOR 1 #define DRIVER_MINOR 0 -#define PCI_VENDOR_ID_MICROSOFT 0x1414 #define PCI_DEVICE_ID_HYPERV_VIDEO 0x5353 DEFINE_DRM_GEM_FOPS(hv_fops); diff --git a/drivers/net/ethernet/microsoft/mana/gdma_main.c b/drivers/net/ethernet/microsoft/mana/gdma_main.c index 5f92401..00d8198 100644 --- a/drivers/net/ethernet/microsoft/mana/gdma_main.c +++ b/drivers/net/ethernet/microsoft/mana/gdma_main.c @@ -1465,10 +1465,6 @@ static void mana_gd_shutdown(struct pci_dev *pdev) pci_disable_device(pdev); } -#ifndef PCI_VENDOR_ID_MICROSOFT -#define PCI_VENDOR_ID_MICROSOFT 0x1414 -#endif - static const struct pci_device_id mana_id_table[] = { { PCI_DEVICE(PCI_VENDOR_ID_MICROSOFT, MANA_PF_DEVICE_ID) }, { PCI_DEVICE(PCI_VENDOR_ID_MICROSOFT, MANA_VF_DEVICE_ID) }, diff --git a/drivers/video/fbdev/hyperv_fb.c b/drivers/video/fbdev/hyperv_fb.c index 886c564..a502c80 100644 --- a/drivers/video/fbdev/hyperv_fb.c +++ b/drivers/video/fbdev/hyperv_fb.c @@ -58,7 +58,6 @@ #include - /* Hyper-V Synthetic Video Protocol definitions and structures */ #define MAX_VMBUS_PKT_SIZE 0x4000 @@ -74,10 +73,8 @@ #define SYNTHVID_DEPTH_WIN8 32 #define SYNTHVID_FB_SIZE_WIN8 (8 * 1024 * 1024) -#define PCI_VENDOR_ID_MICROSOFT 0x1414 #define PCI_DEVICE_ID_HYPERV_VIDEO 0x5353 - enum pipe_msg_type { PIPE_MSG_INVALID, PIPE_MSG_DATA, diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index 6feade6..c008fda 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h @@ -2079,6 +2079,8 @@ #define PCI_DEVICE_ID_ICE_1712 0x1712 #define PCI_DEVICE_ID_VT1724 0x1724 +#define PCI_VENDOR_ID_MICROSOFT 0x1414 + #define PCI_VENDOR_ID_OXSEMI 0x1415 #define PCI_DEVICE_ID_OXSEMI_12PCI840 0x8403 #define PCI_DEVICE_ID_OXSEMI_PCIe840 0xC000