From: eahariha@linux.microsoft.com
To: Deepak Rawat <drawat.floss@gmail.com>,
David Airlie <airlied@linux.ie>, Daniel Vetter <daniel@ffwll.ch>,
"K. Y. Srinivasan" <kys@microsoft.com>,
Haiyang Zhang <haiyangz@microsoft.com>,
Stephen Hemminger <sthemmin@microsoft.com>,
Wei Liu <wei.liu@kernel.org>, Dexuan Cui <decui@microsoft.com>,
"David S. Miller" <davem@davemloft.net>,
Eric Dumazet <edumazet@google.com>,
Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>,
Helge Deller <deller@gmx.de>, Bjorn Helgaas <bhelgaas@google.com>,
Easwar Hariharan <easwar.hariharan@microsoft.com>,
Colin Ian King <colin.i.king@googlemail.com>,
"Gustavo A. R. Silva" <gustavoars@kernel.org>,
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 [thread overview]
Message-ID: <1662674757-31945-2-git-send-email-eahariha@linux.microsoft.com> (raw)
In-Reply-To: <1662674757-31945-1-git-send-email-eahariha@linux.microsoft.com>
From: Easwar Hariharan <easwar.hariharan@microsoft.com>
Move the Microsoft PCI Vendor ID from the various drivers to the pci_ids
file
Signed-off-by: Easwar Hariharan <easwar.hariharan@microsoft.com>
---
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 <linux/hyperv.h>
-
/* 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
--
1.8.3.1
next parent reply other threads:[~2022-09-08 22:06 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <1662674757-31945-1-git-send-email-eahariha@linux.microsoft.com>
2022-09-08 22:05 ` eahariha [this message]
2022-09-09 14:01 ` [PATCH 2/3] pci_ids: Add Microsoft PCI Vendor ID, and remove redundant definitions Vitaly Kuznetsov
[not found] ` <1662749425-3037-1-git-send-email-eahariha@linux.microsoft.com>
2022-09-09 18:50 ` [PATCH v2 2/2] pci_ids: Add the various Microsoft PCI device IDs Easwar Hariharan
2022-09-09 19:38 ` Bjorn Helgaas
2022-09-10 9:29 ` kernel test robot
2022-09-08 22:05 ` [PATCH 3/3] " eahariha
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1662674757-31945-2-git-send-email-eahariha@linux.microsoft.com \
--to=eahariha@linux.microsoft.com \
--cc=airlied@linux.ie \
--cc=bhelgaas@google.com \
--cc=colin.i.king@googlemail.com \
--cc=daniel@ffwll.ch \
--cc=davem@davemloft.net \
--cc=decui@microsoft.com \
--cc=deller@gmx.de \
--cc=drawat.floss@gmail.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=easwar.hariharan@microsoft.com \
--cc=edumazet@google.com \
--cc=gustavoars@kernel.org \
--cc=haiyangz@microsoft.com \
--cc=kuba@kernel.org \
--cc=kys@microsoft.com \
--cc=linux-fbdev@vger.kernel.org \
--cc=linux-hyperv@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=sthemmin@microsoft.com \
--cc=wei.liu@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).