Re: [PATCH] fbdev: Consistently define pci_device_ids using named initializers

[Helge Deller]

On 5/20/26 10:46, Uwe Kleine-König (The Capable Hub) wrote:
> Hello,
>
> On Thu, Apr 30, 2026 at 01:16:36PM +0200, Uwe Kleine-König (The Capable Hub) wrote:
> > diff --git a/drivers/video/fbdev/matrox/matroxfb_base.c b/drivers/video/fbdev/matrox/matroxfb_base.c
> > index e1a4bc7c2318..22774eb1b14c 100644
> > --- a/drivers/video/fbdev/matrox/matroxfb_base.c
> > +++ b/drivers/video/fbdev/matrox/matroxfb_base.c
> > @@ -1642,7 +1642,7 @@ static int initMatrox2(struct matrox_fb_info *minfo, struct board *b)
> >   	int err;
> >   
> >   	static const struct pci_device_id intel_82437[] = {
> > -		{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82437) },
> > +		{ PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_82437) },
> >   		{ },
> >   	};
> >   
>
> after further sharpening my tooling there is an additional change that
> IMHO should be done here:
>
> -		{ },
> +		{ }
>
> and ...
>
> > diff --git a/drivers/video/fbdev/pvr2fb.c b/drivers/video/fbdev/pvr2fb.c
> > index 3f6384e631b1..06aefad75f46 100644
> > --- a/drivers/video/fbdev/pvr2fb.c
> > +++ b/drivers/video/fbdev/pvr2fb.c
> > @@ -993,9 +993,8 @@ static void pvr2fb_pci_remove(struct pci_dev *pdev)
> >   }
> >   
> >   static const struct pci_device_id pvr2fb_pci_tbl[] = {
> > -	{ PCI_VENDOR_ID_NEC, PCI_DEVICE_ID_NEC_NEON250,
> > -	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
> > -	{ 0, },
> > +	{ PCI_VDEVICE(NEC, PCI_DEVICE_ID_NEC_NEON250), },
> > +	{ },
> >   };
> >   
> >   MODULE_DEVICE_TABLE(pci, pvr2fb_pci_tbl);
>
> ... here:
>
> -	{ PCI_VDEVICE(NEC, PCI_DEVICE_ID_NEC_NEON250), },
> +	{ PCI_VDEVICE(NEC, PCI_DEVICE_ID_NEC_NEON250) },
> -	{ },
> +	{ }
>
> Would you mind squashing that into the patch you already applied, maybe
> adding:
>
> 	While touching all these arrays, unify usage of whitespace and
> 	comma in a few drivers.
>
> to the commit log? I can also send a v2 of the patch with these changes
> included if that's easier for you.
>
> Otherwise I will put sending these modifications separately on my todo
> list.

No need to resend anything. I'll clean it up manually during the next few hours....

Helge