From: Huacai Chen <chenhc@lemote.com>
To: Thomas Bogendoerfer <tsbogend@alpha.franken.de>,
Paolo Bonzini <pbonzini@redhat.com>,
Aleksandar Markovic <aleksandar.qemu.devel@gmail.com>,
Rob Herring <robh+dt@kernel.org>
Cc: linux-mips@vger.kernel.org, kvm@vger.kernel.org,
Fuxin Zhang <zhangfx@lemote.com>,
Huacai Chen <chenhuacai@gmail.com>,
Jiaxun Yang <jiaxun.yang@flygoat.com>,
Huacai Chen <chenhc@lemote.com>
Subject: [PATCH 1/5] PCI: Move PCI_VENDOR_ID_REDHAT definition to pci_ids.h
Date: Wed, 29 Jul 2020 14:58:35 +0800 [thread overview]
Message-ID: <1596005919-29365-1-git-send-email-chenhc@lemote.com> (raw)
Instead of duplicating the PCI_VENDOR_ID_REDHAT definition everywhere,
move it to include/linux/pci_ids.h is better.
Signed-off-by: Huacai Chen <chenhc@lemote.com>
---
This patch has been merged into PCI tree, but the current MIPS tree need
it to avoid build error.
drivers/gpu/drm/qxl/qxl_dev.h | 2 --
drivers/net/ethernet/rocker/rocker_hw.h | 1 -
include/linux/pci_ids.h | 2 ++
3 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/qxl/qxl_dev.h b/drivers/gpu/drm/qxl/qxl_dev.h
index a0ee416..a7bc31f 100644
--- a/drivers/gpu/drm/qxl/qxl_dev.h
+++ b/drivers/gpu/drm/qxl/qxl_dev.h
@@ -131,8 +131,6 @@ enum SpiceCursorType {
#pragma pack(push, 1)
-#define REDHAT_PCI_VENDOR_ID 0x1b36
-
/* 0x100-0x11f reserved for spice, 0x1ff used for unstable work */
#define QXL_DEVICE_ID_STABLE 0x0100
diff --git a/drivers/net/ethernet/rocker/rocker_hw.h b/drivers/net/ethernet/rocker/rocker_hw.h
index 59f1f8b..62fd84c 100644
--- a/drivers/net/ethernet/rocker/rocker_hw.h
+++ b/drivers/net/ethernet/rocker/rocker_hw.h
@@ -25,7 +25,6 @@ enum {
#define ROCKER_FP_PORTS_MAX 62
-#define PCI_VENDOR_ID_REDHAT 0x1b36
#define PCI_DEVICE_ID_REDHAT_ROCKER 0x0006
#define ROCKER_PCI_BAR0_SIZE 0x2000
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index 0ad5769..5c709a1 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -2585,6 +2585,8 @@
#define PCI_VENDOR_ID_ASMEDIA 0x1b21
+#define PCI_VENDOR_ID_REDHAT 0x1b36
+
#define PCI_VENDOR_ID_AMAZON_ANNAPURNA_LABS 0x1c36
#define PCI_VENDOR_ID_CIRCUITCO 0x1cc8
--
2.7.0
next reply other threads:[~2020-07-29 6:56 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-29 6:58 Huacai Chen [this message]
2020-07-29 6:58 ` [PATCH 2/5] dt-bindings: mips: Document Loongson kvm guest board Huacai Chen
2020-07-29 9:52 ` Thomas Bogendoerfer
2020-07-29 10:08 ` Huacai Chen
2020-07-31 3:01 ` Huacai Chen
2020-07-31 8:32 ` Thomas Bogendoerfer
2020-07-31 11:56 ` Jiaxun Yang
2020-08-03 6:05 ` Huacai Chen
2020-08-03 9:13 ` Jiaxun Yang
2020-08-04 7:47 ` Thomas Bogendoerfer
2020-07-29 6:58 ` [PATCH 3/5] MIPS: KVM: Add kvm guest support for Loongson-3 Huacai Chen
2020-07-29 6:58 ` [PATCH 4/5] MIPS: Update default config file " Huacai Chen
2020-07-29 6:58 ` [PATCH 5/5] MAINTAINERS: Update KVM/MIPS maintainers Huacai Chen
2023-06-16 7:18 ` Yu Zhao
2023-06-16 7:55 ` Huacai Chen
2023-06-16 8:23 ` Thomas Bogendoerfer
2023-06-16 8:31 ` Huacai Chen
2023-06-18 7:55 ` Thomas Bogendoerfer
2023-06-17 1:52 ` Yu Zhao
2023-06-18 2:13 ` Huacai Chen
2023-06-18 2:51 ` Yu Zhao
2023-06-26 8:00 ` Huacai Chen
2023-06-27 18:58 ` Yu Zhao
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=1596005919-29365-1-git-send-email-chenhc@lemote.com \
--to=chenhc@lemote.com \
--cc=aleksandar.qemu.devel@gmail.com \
--cc=chenhuacai@gmail.com \
--cc=jiaxun.yang@flygoat.com \
--cc=kvm@vger.kernel.org \
--cc=linux-mips@vger.kernel.org \
--cc=pbonzini@redhat.com \
--cc=robh+dt@kernel.org \
--cc=tsbogend@alpha.franken.de \
--cc=zhangfx@lemote.com \
/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).