On Wed, Apr 19, 2023 at 09:00:15AM +0200, Thomas Zimmermann wrote:
Am 19.04.23 um 00:57 schrieb Patrick McLean:
Currently the ASPEED PCI vendor ID is defined in
drivers/gpu/drm/ast/ast_drv.c, move that to include/linux/pci_ids.h
with all the rest of the PCI vendor ID definitions. Rename the definition
to follow the format that the other definitions follow.
Thanks a lot. Can you please also move and rename the PCI device ids? [1]
Generally we move things to pci_ids.h only when they are shared
between multiple drivers. This is mostly to make backports easier.
PCI_VENDOR_ID_ASPEED is (or will be) used in both ast_drv.c and
libata-core.c, so it qualifies.
It doesn't look like PCI_CHIP_AST2000 and PCI_CHIP_AST2100 would
qualify since they're only used in ast_drv.c and ast_main.c, which are
part of the same driver.
[1] https://elixir.bootlin.com/linux/v6.2/source/drivers/gpu/drm/ast/ast_drv.h#L52
Signed-off-by: Patrick McLean <chutzpah@xxxxxxxxxx>
---
drivers/gpu/drm/ast/ast_drv.c | 4 +---
include/linux/pci_ids.h | 2 ++
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/ast/ast_drv.c b/drivers/gpu/drm/ast/ast_drv.c
index d78852c7cf5b..232e797793b6 100644
--- a/drivers/gpu/drm/ast/ast_drv.c
+++ b/drivers/gpu/drm/ast/ast_drv.c
@@ -70,12 +70,10 @@ static const struct drm_driver ast_driver = {
* PCI driver
*/
-#define PCI_VENDOR_ASPEED 0x1a03
-
#define AST_VGA_DEVICE(id, info) { \
.class = PCI_BASE_CLASS_DISPLAY << 16, \
.class_mask = 0xff0000, \
- .vendor = PCI_VENDOR_ASPEED, \
+ .vendor = PCI_VENDOR_ID_ASPEED, \
.device = id, \
.subvendor = PCI_ANY_ID, \
.subdevice = PCI_ANY_ID, \
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index 45c3d62e616d..40e04e88ca5a 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -2553,6 +2553,8 @@
#define PCI_DEVICE_ID_NETRONOME_NFP3800_VF 0x3803
#define PCI_DEVICE_ID_NETRONOME_NFP6000_VF 0x6003
+#define PCI_VENDOR_ID_ASPEED 0x1a03
+
#define PCI_VENDOR_ID_QMI 0x1a32
#define PCI_VENDOR_ID_AZWAVE 0x1a3b
--
Thomas Zimmermann
Graphics Driver Developer
SUSE Software Solutions Germany GmbH
Maxfeldstr. 5, 90409 Nürnberg, Germany
(HRB 36809, AG Nürnberg)
Geschäftsführer: Ivo Totev
Attachment:
OpenPGP_signature
Description: OpenPGP digital signature