| Message ID | 20230418011720.3900090-2-chutzpah@gentoo.org |
|---|---|
| State | New |
| Headers | show |
| Series | [1/2] gpu: Move ASPEED vendor ID definition to pci_ids.h | expand |
On Mon, Apr 17, 2023 at 06:17:19PM -0700, Patrick McLean wrote: > 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. > > Signed-off-by: Patrick McLean <chutzpah@gentoo.org> Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch> for merging through whatever tree this series lands through. -Daniel > --- > 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..6634741aea80 100644 > --- a/include/linux/pci_ids.h > +++ b/include/linux/pci_ids.h > @@ -815,6 +815,8 @@ > #define PCI_VENDOR_ID_ASUSTEK 0x1043 > #define PCI_DEVICE_ID_ASUSTEK_0675 0x0675 > > +#define PCI_VENDOR_ID_ASPEED 0x1a03 > + > #define PCI_VENDOR_ID_DPT 0x1044 > #define PCI_DEVICE_ID_DPT 0xa400 > > -- > 2.40.0 >
On 4/18/23 4:17 AM, Patrick McLean wrote: > 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. > > Signed-off-by: Patrick McLean <chutzpah@gentoo.org> [...] > diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h > index 45c3d62e616d..6634741aea80 100644 > --- a/include/linux/pci_ids.h > +++ b/include/linux/pci_ids.h > @@ -815,6 +815,8 @@ > #define PCI_VENDOR_ID_ASUSTEK 0x1043 > #define PCI_DEVICE_ID_ASUSTEK_0675 0x0675 > > +#define PCI_VENDOR_ID_ASPEED 0x1a03 > + > #define PCI_VENDOR_ID_DPT 0x1044 > #define PCI_DEVICE_ID_DPT 0xa400 > The vendor IDs in this file are sorted numerically, not alphabetically... MBR, Sergey
Most subject lines for pci_ids.h look like this: PCI: Add ASPEED vendor ID On Mon, Apr 17, 2023 at 06:17:19PM -0700, Patrick McLean wrote: > 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. > > Signed-off-by: Patrick McLean <chutzpah@gentoo.org> Given the subject line and file placement (below) updates, Acked-by: Bjorn Helgaas <bhelgaas@google.com> > --- > 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..6634741aea80 100644 > --- a/include/linux/pci_ids.h > +++ b/include/linux/pci_ids.h > @@ -815,6 +815,8 @@ > #define PCI_VENDOR_ID_ASUSTEK 0x1043 > #define PCI_DEVICE_ID_ASUSTEK_0675 0x0675 > > +#define PCI_VENDOR_ID_ASPEED 0x1a03 This looks like a random placement. Please keep sorted by numeric vendor ID. I'll make the comment at the top a little more specific. > #define PCI_VENDOR_ID_DPT 0x1044 > #define PCI_DEVICE_ID_DPT 0xa400 > > -- > 2.40.0 >
On Tue, Apr 18, 2023 at 04:14:03PM -0500, Bjorn Helgaas wrote: > Most subject lines for pci_ids.h look like this: > > PCI: Add ASPEED vendor ID > > On Mon, Apr 17, 2023 at 06:17:19PM -0700, Patrick McLean wrote: > > 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. > > > > Signed-off-by: Patrick McLean <chutzpah@gentoo.org> > > Given the subject line and file placement (below) updates, > > Acked-by: Bjorn Helgaas <bhelgaas@google.com> Oh, at the same time, would you mind rewrapping at least this commit log so it fits in 75 columns to "git log" doesn't overflow an 80 column terminal? Bjorn
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..6634741aea80 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h @@ -815,6 +815,8 @@ #define PCI_VENDOR_ID_ASUSTEK 0x1043 #define PCI_DEVICE_ID_ASUSTEK_0675 0x0675 +#define PCI_VENDOR_ID_ASPEED 0x1a03 + #define PCI_VENDOR_ID_DPT 0x1044 #define PCI_DEVICE_ID_DPT 0xa400
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. Signed-off-by: Patrick McLean <chutzpah@gentoo.org> --- drivers/gpu/drm/ast/ast_drv.c | 4 +--- include/linux/pci_ids.h | 2 ++ 2 files changed, 3 insertions(+), 3 deletions(-)