Re: [PATCH 16/22] dvb-usb: Replace comments with C99 initializers
Em Sat, 26 Mar 2022 15:11:46 -0500 Larry Finger escreveu: > On 3/26/22 14:51, Joe Perches wrote: > > On Sat, 2022-03-26 at 19:27 +0100, Mauro Carvalho Chehab wrote: > >> Em Sat, 26 Mar 2022 19:24:54 +0100 > >> Mauro Carvalho Chehab escreveu: > >> > >>> Em Sat, 26 Mar 2022 17:59:03 +0100 > >>> Benjamin Stürz escreveu: > >>> > This replaces comments with C99's designated > initializers because the kernel supports them now. > > Signed-off-by: Benjamin Stürz > --- > drivers/media/usb/dvb-usb/dibusb-mb.c | 62 +-- > drivers/media/usb/dvb-usb/dibusb-mc.c | 34 +++ > 2 files changed, 48 insertions(+), 48 deletions(-) > > diff --git a/drivers/media/usb/dvb-usb/dibusb-mb.c > b/drivers/media/usb/dvb-usb/dibusb-mb.c > index e9dc27f73970..f188e07f518b 100644 > --- a/drivers/media/usb/dvb-usb/dibusb-mb.c > +++ b/drivers/media/usb/dvb-usb/dibusb-mb.c > @@ -122,40 +122,40 @@ static int dibusb_probe(struct usb_interface *intf, > > /* do not change the order of the ID table */ > static struct usb_device_id dibusb_dib3000mb_table [] = { > -/* 00 */{ USB_DEVICE(USB_VID_WIDEVIEW, > USB_PID_AVERMEDIA_DVBT_USB_COLD) }, > -/* 01 */{ USB_DEVICE(USB_VID_WIDEVIEW, > USB_PID_AVERMEDIA_DVBT_USB_WARM) }, > -/* 02 */{ USB_DEVICE(USB_VID_COMPRO, > USB_PID_COMPRO_DVBU2000_COLD) }, > -/* 03 */{ USB_DEVICE(USB_VID_COMPRO, > USB_PID_COMPRO_DVBU2000_WARM) }, > -/* 04 */{ USB_DEVICE(USB_VID_COMPRO_UNK, > USB_PID_COMPRO_DVBU2000_UNK_COLD) }, > -/* 05 */{ USB_DEVICE(USB_VID_DIBCOM, > USB_PID_DIBCOM_MOD3000_COLD) }, > -/* 06 */{ USB_DEVICE(USB_VID_DIBCOM, > USB_PID_DIBCOM_MOD3000_WARM) }, > -/* 07 */{ USB_DEVICE(USB_VID_EMPIA, > USB_PID_KWORLD_VSTREAM_COLD) }, > -/* 08 */{ USB_DEVICE(USB_VID_EMPIA, > USB_PID_KWORLD_VSTREAM_WARM) }, > -/* 09 */{ USB_DEVICE(USB_VID_GRANDTEC, > USB_PID_GRANDTEC_DVBT_USB_COLD) }, > -/* 10 */{ USB_DEVICE(USB_VID_GRANDTEC, > USB_PID_GRANDTEC_DVBT_USB_WARM) }, > -/* 11 */{ USB_DEVICE(USB_VID_GRANDTEC, > USB_PID_DIBCOM_MOD3000_COLD) }, > -/* 12 */{ USB_DEVICE(USB_VID_GRANDTEC, > USB_PID_DIBCOM_MOD3000_WARM) }, > -/* 13 */{ USB_DEVICE(USB_VID_HYPER_PALTEK, > USB_PID_UNK_HYPER_PALTEK_COLD) }, > -/* 14 */{ USB_DEVICE(USB_VID_HYPER_PALTEK, > USB_PID_UNK_HYPER_PALTEK_WARM) }, > -/* 15 */{ USB_DEVICE(USB_VID_VISIONPLUS, > USB_PID_TWINHAN_VP7041_COLD) }, > -/* 16 */{ USB_DEVICE(USB_VID_VISIONPLUS, > USB_PID_TWINHAN_VP7041_WARM) }, > -/* 17 */{ USB_DEVICE(USB_VID_TWINHAN, > USB_PID_TWINHAN_VP7041_COLD) }, > -/* 18 */{ USB_DEVICE(USB_VID_TWINHAN, > USB_PID_TWINHAN_VP7041_WARM) }, > -/* 19 */{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC, > USB_PID_ULTIMA_TVBOX_COLD) }, > -/* 20 */{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC, > USB_PID_ULTIMA_TVBOX_WARM) }, > -/* 21 */{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC, > USB_PID_ULTIMA_TVBOX_AN2235_COLD) }, > -/* 22 */{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC, > USB_PID_ULTIMA_TVBOX_AN2235_WARM) }, > -/* 23 */{ USB_DEVICE(USB_VID_ADSTECH, > USB_PID_ADSTECH_USB2_COLD) }, > +[0] = { USB_DEVICE(USB_VID_WIDEVIEW, > USB_PID_AVERMEDIA_DVBT_USB_COLD) }, > +[1] = { USB_DEVICE(USB_VID_WIDEVIEW, > USB_PID_AVERMEDIA_DVBT_USB_WARM) }, > >>> > >>> While here, please properly indent this table, and respect the 80-columns > >>> limit, > >>> e. g.: > >>> > >>> static struct usb_device_id dibusb_dib3000mb_table [] = { > >>> [0] = { USB_DEVICE(USB_VID_WIDEVIEW > >>> USB_PID_AVERMEDIA_DVBT_USB_COLD) > >>> }, > >>> [1] = { USB_DEVICE(USB_VID_WIDEVIEW, > >>>USB_PID_AVERMEDIA_DVBT_USB_WARM) > >>> }, > >>> ... > >> > >> Err something went wrong with my space bar and I ended hitting send to > >> soon... I meant: > >> > >> static struct usb_device_id dibusb_dib3000mb_table [] = { > >>[0] = { USB_DEVICE(USB_VID_WIDEVIEW > >> USB_PID_AVERMEDIA_DVBT_USB_COLD) > >>}, > >>[1] = { USB_DEVICE(USB_VID_WIDEVIEW, > >> USB_PID_AVERMEDIA_DVBT_USB_WARM) > >>}, > >>... > >> }; > > > > maybe static const too > > > > and > > > > maybe > > > > #define DIB_DEVICE(vid, pid)\ > > { USB_DEVICE(USB_VID_ ## vid, USB_PID_ ## pid) } > > > > so maybe > > > > static const struct usb_device_id dib
Re: [PATCH 16/22] dvb-usb: Replace comments with C99 initializers
On 3/26/22 14:51, Joe Perches wrote: On Sat, 2022-03-26 at 19:27 +0100, Mauro Carvalho Chehab wrote: Em Sat, 26 Mar 2022 19:24:54 +0100 Mauro Carvalho Chehab escreveu: Em Sat, 26 Mar 2022 17:59:03 +0100 Benjamin Stürz escreveu: This replaces comments with C99's designated initializers because the kernel supports them now. Signed-off-by: Benjamin Stürz --- drivers/media/usb/dvb-usb/dibusb-mb.c | 62 +-- drivers/media/usb/dvb-usb/dibusb-mc.c | 34 +++ 2 files changed, 48 insertions(+), 48 deletions(-) diff --git a/drivers/media/usb/dvb-usb/dibusb-mb.c b/drivers/media/usb/dvb-usb/dibusb-mb.c index e9dc27f73970..f188e07f518b 100644 --- a/drivers/media/usb/dvb-usb/dibusb-mb.c +++ b/drivers/media/usb/dvb-usb/dibusb-mb.c @@ -122,40 +122,40 @@ static int dibusb_probe(struct usb_interface *intf, /* do not change the order of the ID table */ static struct usb_device_id dibusb_dib3000mb_table [] = { -/* 00 */ { USB_DEVICE(USB_VID_WIDEVIEW, USB_PID_AVERMEDIA_DVBT_USB_COLD) }, -/* 01 */ { USB_DEVICE(USB_VID_WIDEVIEW, USB_PID_AVERMEDIA_DVBT_USB_WARM) }, -/* 02 */ { USB_DEVICE(USB_VID_COMPRO, USB_PID_COMPRO_DVBU2000_COLD) }, -/* 03 */ { USB_DEVICE(USB_VID_COMPRO, USB_PID_COMPRO_DVBU2000_WARM) }, -/* 04 */ { USB_DEVICE(USB_VID_COMPRO_UNK, USB_PID_COMPRO_DVBU2000_UNK_COLD) }, -/* 05 */ { USB_DEVICE(USB_VID_DIBCOM, USB_PID_DIBCOM_MOD3000_COLD) }, -/* 06 */ { USB_DEVICE(USB_VID_DIBCOM, USB_PID_DIBCOM_MOD3000_WARM) }, -/* 07 */ { USB_DEVICE(USB_VID_EMPIA, USB_PID_KWORLD_VSTREAM_COLD) }, -/* 08 */ { USB_DEVICE(USB_VID_EMPIA, USB_PID_KWORLD_VSTREAM_WARM) }, -/* 09 */ { USB_DEVICE(USB_VID_GRANDTEC, USB_PID_GRANDTEC_DVBT_USB_COLD) }, -/* 10 */ { USB_DEVICE(USB_VID_GRANDTEC, USB_PID_GRANDTEC_DVBT_USB_WARM) }, -/* 11 */ { USB_DEVICE(USB_VID_GRANDTEC, USB_PID_DIBCOM_MOD3000_COLD) }, -/* 12 */ { USB_DEVICE(USB_VID_GRANDTEC, USB_PID_DIBCOM_MOD3000_WARM) }, -/* 13 */ { USB_DEVICE(USB_VID_HYPER_PALTEK, USB_PID_UNK_HYPER_PALTEK_COLD) }, -/* 14 */ { USB_DEVICE(USB_VID_HYPER_PALTEK, USB_PID_UNK_HYPER_PALTEK_WARM) }, -/* 15 */ { USB_DEVICE(USB_VID_VISIONPLUS, USB_PID_TWINHAN_VP7041_COLD) }, -/* 16 */ { USB_DEVICE(USB_VID_VISIONPLUS, USB_PID_TWINHAN_VP7041_WARM) }, -/* 17 */ { USB_DEVICE(USB_VID_TWINHAN, USB_PID_TWINHAN_VP7041_COLD) }, -/* 18 */ { USB_DEVICE(USB_VID_TWINHAN, USB_PID_TWINHAN_VP7041_WARM) }, -/* 19 */ { USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC, USB_PID_ULTIMA_TVBOX_COLD) }, -/* 20 */ { USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC, USB_PID_ULTIMA_TVBOX_WARM) }, -/* 21 */ { USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC, USB_PID_ULTIMA_TVBOX_AN2235_COLD) }, -/* 22 */ { USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC, USB_PID_ULTIMA_TVBOX_AN2235_WARM) }, -/* 23 */ { USB_DEVICE(USB_VID_ADSTECH, USB_PID_ADSTECH_USB2_COLD) }, +[0] = { USB_DEVICE(USB_VID_WIDEVIEW, USB_PID_AVERMEDIA_DVBT_USB_COLD) }, +[1] = { USB_DEVICE(USB_VID_WIDEVIEW, USB_PID_AVERMEDIA_DVBT_USB_WARM) }, While here, please properly indent this table, and respect the 80-columns limit, e. g.: static struct usb_device_id dibusb_dib3000mb_table [] = { [0] = { USB_DEVICE(USB_VID_WIDEVIEW USB_PID_AVERMEDIA_DVBT_USB_COLD) }, [1] = { USB_DEVICE(USB_VID_WIDEVIEW, USB_PID_AVERMEDIA_DVBT_USB_WARM) }, ... Err something went wrong with my space bar and I ended hitting send to soon... I meant: static struct usb_device_id dibusb_dib3000mb_table [] = { [0] = { USB_DEVICE(USB_VID_WIDEVIEW USB_PID_AVERMEDIA_DVBT_USB_COLD) }, [1] = { USB_DEVICE(USB_VID_WIDEVIEW, USB_PID_AVERMEDIA_DVBT_USB_WARM) }, ... }; maybe static const too and maybe #define DIB_DEVICE(vid, pid)\ { USB_DEVICE(USB_VID_ ## vid, USB_PID_ ## pid) } so maybe static const struct usb_device_id dibusb_dib3000mb_table[] = { [0] = DIB_DEVICE(WIDEVIEW, AVERMEDIA_DVBT_USB_COLD), [1] = DIB_DEVICE(WIDEVIEW, AVERMEDIA_DVBT_USB_WARM), ... }; though I _really_ doubt the value of the specific indexing. I think this isn't really worth changing at all. I agree. For the drivers that I maintain, I try to keep the vendor and device ids in numerical order. As this table does not require a special order, adding a new one in the middle would require redoing all of then after that point. That would be pointless work! Larry
Re: [PATCH 16/22] dvb-usb: Replace comments with C99 initializers
On Sat, 2022-03-26 at 19:27 +0100, Mauro Carvalho Chehab wrote: > Em Sat, 26 Mar 2022 19:24:54 +0100 > Mauro Carvalho Chehab escreveu: > > > Em Sat, 26 Mar 2022 17:59:03 +0100 > > Benjamin Stürz escreveu: > > > > > This replaces comments with C99's designated > > > initializers because the kernel supports them now. > > > > > > Signed-off-by: Benjamin Stürz > > > --- > > > drivers/media/usb/dvb-usb/dibusb-mb.c | 62 +-- > > > drivers/media/usb/dvb-usb/dibusb-mc.c | 34 +++ > > > 2 files changed, 48 insertions(+), 48 deletions(-) > > > > > > diff --git a/drivers/media/usb/dvb-usb/dibusb-mb.c > > > b/drivers/media/usb/dvb-usb/dibusb-mb.c > > > index e9dc27f73970..f188e07f518b 100644 > > > --- a/drivers/media/usb/dvb-usb/dibusb-mb.c > > > +++ b/drivers/media/usb/dvb-usb/dibusb-mb.c > > > @@ -122,40 +122,40 @@ static int dibusb_probe(struct usb_interface *intf, > > > > > > /* do not change the order of the ID table */ > > > static struct usb_device_id dibusb_dib3000mb_table [] = { > > > -/* 00 */ { USB_DEVICE(USB_VID_WIDEVIEW, > > > USB_PID_AVERMEDIA_DVBT_USB_COLD) }, > > > -/* 01 */ { USB_DEVICE(USB_VID_WIDEVIEW, > > > USB_PID_AVERMEDIA_DVBT_USB_WARM) }, > > > -/* 02 */ { USB_DEVICE(USB_VID_COMPRO, > > > USB_PID_COMPRO_DVBU2000_COLD) }, > > > -/* 03 */ { USB_DEVICE(USB_VID_COMPRO, > > > USB_PID_COMPRO_DVBU2000_WARM) }, > > > -/* 04 */ { USB_DEVICE(USB_VID_COMPRO_UNK, > > > USB_PID_COMPRO_DVBU2000_UNK_COLD) }, > > > -/* 05 */ { USB_DEVICE(USB_VID_DIBCOM, > > > USB_PID_DIBCOM_MOD3000_COLD) }, > > > -/* 06 */ { USB_DEVICE(USB_VID_DIBCOM, > > > USB_PID_DIBCOM_MOD3000_WARM) }, > > > -/* 07 */ { USB_DEVICE(USB_VID_EMPIA, > > > USB_PID_KWORLD_VSTREAM_COLD) }, > > > -/* 08 */ { USB_DEVICE(USB_VID_EMPIA, > > > USB_PID_KWORLD_VSTREAM_WARM) }, > > > -/* 09 */ { USB_DEVICE(USB_VID_GRANDTEC, > > > USB_PID_GRANDTEC_DVBT_USB_COLD) }, > > > -/* 10 */ { USB_DEVICE(USB_VID_GRANDTEC, > > > USB_PID_GRANDTEC_DVBT_USB_WARM) }, > > > -/* 11 */ { USB_DEVICE(USB_VID_GRANDTEC, > > > USB_PID_DIBCOM_MOD3000_COLD) }, > > > -/* 12 */ { USB_DEVICE(USB_VID_GRANDTEC, > > > USB_PID_DIBCOM_MOD3000_WARM) }, > > > -/* 13 */ { USB_DEVICE(USB_VID_HYPER_PALTEK, > > > USB_PID_UNK_HYPER_PALTEK_COLD) }, > > > -/* 14 */ { USB_DEVICE(USB_VID_HYPER_PALTEK, > > > USB_PID_UNK_HYPER_PALTEK_WARM) }, > > > -/* 15 */ { USB_DEVICE(USB_VID_VISIONPLUS, > > > USB_PID_TWINHAN_VP7041_COLD) }, > > > -/* 16 */ { USB_DEVICE(USB_VID_VISIONPLUS, > > > USB_PID_TWINHAN_VP7041_WARM) }, > > > -/* 17 */ { USB_DEVICE(USB_VID_TWINHAN, > > > USB_PID_TWINHAN_VP7041_COLD) }, > > > -/* 18 */ { USB_DEVICE(USB_VID_TWINHAN, > > > USB_PID_TWINHAN_VP7041_WARM) }, > > > -/* 19 */ { USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC, > > > USB_PID_ULTIMA_TVBOX_COLD) }, > > > -/* 20 */ { USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC, > > > USB_PID_ULTIMA_TVBOX_WARM) }, > > > -/* 21 */ { USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC, > > > USB_PID_ULTIMA_TVBOX_AN2235_COLD) }, > > > -/* 22 */ { USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC, > > > USB_PID_ULTIMA_TVBOX_AN2235_WARM) }, > > > -/* 23 */ { USB_DEVICE(USB_VID_ADSTECH, > > > USB_PID_ADSTECH_USB2_COLD) }, > > > +[0] = { USB_DEVICE(USB_VID_WIDEVIEW, > > > USB_PID_AVERMEDIA_DVBT_USB_COLD) }, > > > +[1] = { USB_DEVICE(USB_VID_WIDEVIEW, > > > USB_PID_AVERMEDIA_DVBT_USB_WARM) }, > > > > While here, please properly indent this table, and respect the 80-columns > > limit, > > e. g.: > > > > static struct usb_device_id dibusb_dib3000mb_table [] = { > > [0] = { USB_DEVICE(USB_VID_WIDEVIEW > >USB_PID_AVERMEDIA_DVBT_USB_COLD) > > }, > > [1] = { USB_DEVICE(USB_VID_WIDEVIEW, > > USB_PID_AVERMEDIA_DVBT_USB_WARM) > > }, > > ... > > Err something went wrong with my space bar and I ended hitting send to > soon... I meant: > > static struct usb_device_id dibusb_dib3000mb_table [] = { > [0] = { USB_DEVICE(USB_VID_WIDEVIEW > USB_PID_AVERMEDIA_DVBT_USB_COLD) > }, > [1] = { USB_DEVICE(USB_VID_WIDEVIEW, > USB_PID_AVERMEDIA_DVBT_USB_WARM) > }, > ... > }; maybe static const too and maybe #define DIB_DEVICE(vid, pid)\ { USB_DEVICE(USB_VID_ ## vid, USB_PID_ ## pid) } so maybe static const struct usb_device_id dibusb_dib3000mb_table[] = { [0] = DIB_DEVICE(WIDEVIEW, AVERMEDIA_DVBT_USB_COLD), [1] = DIB_DEVICE(WIDEVIEW, AVERMEDIA_DVBT_USB_WARM), ... }; though I _really_ doubt the value of the specific indexing. I think this isn't really worth changing at all.
Re: [PATCH 16/22] dvb-usb: Replace comments with C99 initializers
Em Sat, 26 Mar 2022 19:24:54 +0100 Mauro Carvalho Chehab escreveu: > Em Sat, 26 Mar 2022 17:59:03 +0100 > Benjamin Stürz escreveu: > > > This replaces comments with C99's designated > > initializers because the kernel supports them now. > > > > Signed-off-by: Benjamin Stürz > > --- > > drivers/media/usb/dvb-usb/dibusb-mb.c | 62 +-- > > drivers/media/usb/dvb-usb/dibusb-mc.c | 34 +++ > > 2 files changed, 48 insertions(+), 48 deletions(-) > > > > diff --git a/drivers/media/usb/dvb-usb/dibusb-mb.c > > b/drivers/media/usb/dvb-usb/dibusb-mb.c > > index e9dc27f73970..f188e07f518b 100644 > > --- a/drivers/media/usb/dvb-usb/dibusb-mb.c > > +++ b/drivers/media/usb/dvb-usb/dibusb-mb.c > > @@ -122,40 +122,40 @@ static int dibusb_probe(struct usb_interface *intf, > > > > /* do not change the order of the ID table */ > > static struct usb_device_id dibusb_dib3000mb_table [] = { > > -/* 00 */ { USB_DEVICE(USB_VID_WIDEVIEW, > > USB_PID_AVERMEDIA_DVBT_USB_COLD) }, > > -/* 01 */ { USB_DEVICE(USB_VID_WIDEVIEW, > > USB_PID_AVERMEDIA_DVBT_USB_WARM) }, > > -/* 02 */ { USB_DEVICE(USB_VID_COMPRO, > > USB_PID_COMPRO_DVBU2000_COLD) }, > > -/* 03 */ { USB_DEVICE(USB_VID_COMPRO, > > USB_PID_COMPRO_DVBU2000_WARM) }, > > -/* 04 */ { USB_DEVICE(USB_VID_COMPRO_UNK, > > USB_PID_COMPRO_DVBU2000_UNK_COLD) }, > > -/* 05 */ { USB_DEVICE(USB_VID_DIBCOM, > > USB_PID_DIBCOM_MOD3000_COLD) }, > > -/* 06 */ { USB_DEVICE(USB_VID_DIBCOM, > > USB_PID_DIBCOM_MOD3000_WARM) }, > > -/* 07 */ { USB_DEVICE(USB_VID_EMPIA, > > USB_PID_KWORLD_VSTREAM_COLD) }, > > -/* 08 */ { USB_DEVICE(USB_VID_EMPIA, > > USB_PID_KWORLD_VSTREAM_WARM) }, > > -/* 09 */ { USB_DEVICE(USB_VID_GRANDTEC, > > USB_PID_GRANDTEC_DVBT_USB_COLD) }, > > -/* 10 */ { USB_DEVICE(USB_VID_GRANDTEC, > > USB_PID_GRANDTEC_DVBT_USB_WARM) }, > > -/* 11 */ { USB_DEVICE(USB_VID_GRANDTEC, > > USB_PID_DIBCOM_MOD3000_COLD) }, > > -/* 12 */ { USB_DEVICE(USB_VID_GRANDTEC, > > USB_PID_DIBCOM_MOD3000_WARM) }, > > -/* 13 */ { USB_DEVICE(USB_VID_HYPER_PALTEK, > > USB_PID_UNK_HYPER_PALTEK_COLD) }, > > -/* 14 */ { USB_DEVICE(USB_VID_HYPER_PALTEK, > > USB_PID_UNK_HYPER_PALTEK_WARM) }, > > -/* 15 */ { USB_DEVICE(USB_VID_VISIONPLUS, > > USB_PID_TWINHAN_VP7041_COLD) }, > > -/* 16 */ { USB_DEVICE(USB_VID_VISIONPLUS, > > USB_PID_TWINHAN_VP7041_WARM) }, > > -/* 17 */ { USB_DEVICE(USB_VID_TWINHAN, > > USB_PID_TWINHAN_VP7041_COLD) }, > > -/* 18 */ { USB_DEVICE(USB_VID_TWINHAN, > > USB_PID_TWINHAN_VP7041_WARM) }, > > -/* 19 */ { USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC, > > USB_PID_ULTIMA_TVBOX_COLD) }, > > -/* 20 */ { USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC, > > USB_PID_ULTIMA_TVBOX_WARM) }, > > -/* 21 */ { USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC, > > USB_PID_ULTIMA_TVBOX_AN2235_COLD) }, > > -/* 22 */ { USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC, > > USB_PID_ULTIMA_TVBOX_AN2235_WARM) }, > > -/* 23 */ { USB_DEVICE(USB_VID_ADSTECH, > > USB_PID_ADSTECH_USB2_COLD) }, > > +[0] = { USB_DEVICE(USB_VID_WIDEVIEW, > > USB_PID_AVERMEDIA_DVBT_USB_COLD) }, > > +[1] = { USB_DEVICE(USB_VID_WIDEVIEW, > > USB_PID_AVERMEDIA_DVBT_USB_WARM) }, > > While here, please properly indent this table, and respect the 80-columns > limit, > e. g.: > > static struct usb_device_id dibusb_dib3000mb_table [] = { > [0] = { USB_DEVICE(USB_VID_WIDEVIEW > USB_PID_AVERMEDIA_DVBT_USB_COLD) > }, > [1] = { USB_DEVICE(USB_VID_WIDEVIEW, >USB_PID_AVERMEDIA_DVBT_USB_WARM) > }, > ... Err something went wrong with my space bar and I ended hitting send to soon... I meant: static struct usb_device_id dibusb_dib3000mb_table [] = { [0] = { USB_DEVICE(USB_VID_WIDEVIEW USB_PID_AVERMEDIA_DVBT_USB_COLD) }, [1] = { USB_DEVICE(USB_VID_WIDEVIEW, USB_PID_AVERMEDIA_DVBT_USB_WARM) }, ... }; Thanks, Mauro
Re: [PATCH 16/22] dvb-usb: Replace comments with C99 initializers
Em Sat, 26 Mar 2022 17:59:03 +0100 Benjamin Stürz escreveu: > This replaces comments with C99's designated > initializers because the kernel supports them now. > > Signed-off-by: Benjamin Stürz > --- > drivers/media/usb/dvb-usb/dibusb-mb.c | 62 +-- > drivers/media/usb/dvb-usb/dibusb-mc.c | 34 +++ > 2 files changed, 48 insertions(+), 48 deletions(-) > > diff --git a/drivers/media/usb/dvb-usb/dibusb-mb.c > b/drivers/media/usb/dvb-usb/dibusb-mb.c > index e9dc27f73970..f188e07f518b 100644 > --- a/drivers/media/usb/dvb-usb/dibusb-mb.c > +++ b/drivers/media/usb/dvb-usb/dibusb-mb.c > @@ -122,40 +122,40 @@ static int dibusb_probe(struct usb_interface *intf, > > /* do not change the order of the ID table */ > static struct usb_device_id dibusb_dib3000mb_table [] = { > -/* 00 */ { USB_DEVICE(USB_VID_WIDEVIEW, > USB_PID_AVERMEDIA_DVBT_USB_COLD) }, > -/* 01 */ { USB_DEVICE(USB_VID_WIDEVIEW, > USB_PID_AVERMEDIA_DVBT_USB_WARM) }, > -/* 02 */ { USB_DEVICE(USB_VID_COMPRO, > USB_PID_COMPRO_DVBU2000_COLD) }, > -/* 03 */ { USB_DEVICE(USB_VID_COMPRO, > USB_PID_COMPRO_DVBU2000_WARM) }, > -/* 04 */ { USB_DEVICE(USB_VID_COMPRO_UNK, > USB_PID_COMPRO_DVBU2000_UNK_COLD) }, > -/* 05 */ { USB_DEVICE(USB_VID_DIBCOM, > USB_PID_DIBCOM_MOD3000_COLD) }, > -/* 06 */ { USB_DEVICE(USB_VID_DIBCOM, > USB_PID_DIBCOM_MOD3000_WARM) }, > -/* 07 */ { USB_DEVICE(USB_VID_EMPIA, > USB_PID_KWORLD_VSTREAM_COLD) }, > -/* 08 */ { USB_DEVICE(USB_VID_EMPIA, > USB_PID_KWORLD_VSTREAM_WARM) }, > -/* 09 */ { USB_DEVICE(USB_VID_GRANDTEC, > USB_PID_GRANDTEC_DVBT_USB_COLD) }, > -/* 10 */ { USB_DEVICE(USB_VID_GRANDTEC, > USB_PID_GRANDTEC_DVBT_USB_WARM) }, > -/* 11 */ { USB_DEVICE(USB_VID_GRANDTEC, > USB_PID_DIBCOM_MOD3000_COLD) }, > -/* 12 */ { USB_DEVICE(USB_VID_GRANDTEC, > USB_PID_DIBCOM_MOD3000_WARM) }, > -/* 13 */ { USB_DEVICE(USB_VID_HYPER_PALTEK, > USB_PID_UNK_HYPER_PALTEK_COLD) }, > -/* 14 */ { USB_DEVICE(USB_VID_HYPER_PALTEK, > USB_PID_UNK_HYPER_PALTEK_WARM) }, > -/* 15 */ { USB_DEVICE(USB_VID_VISIONPLUS, > USB_PID_TWINHAN_VP7041_COLD) }, > -/* 16 */ { USB_DEVICE(USB_VID_VISIONPLUS, > USB_PID_TWINHAN_VP7041_WARM) }, > -/* 17 */ { USB_DEVICE(USB_VID_TWINHAN, > USB_PID_TWINHAN_VP7041_COLD) }, > -/* 18 */ { USB_DEVICE(USB_VID_TWINHAN, > USB_PID_TWINHAN_VP7041_WARM) }, > -/* 19 */ { USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC, > USB_PID_ULTIMA_TVBOX_COLD) }, > -/* 20 */ { USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC, > USB_PID_ULTIMA_TVBOX_WARM) }, > -/* 21 */ { USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC, > USB_PID_ULTIMA_TVBOX_AN2235_COLD) }, > -/* 22 */ { USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC, > USB_PID_ULTIMA_TVBOX_AN2235_WARM) }, > -/* 23 */ { USB_DEVICE(USB_VID_ADSTECH, > USB_PID_ADSTECH_USB2_COLD) }, > +[0] = { USB_DEVICE(USB_VID_WIDEVIEW, > USB_PID_AVERMEDIA_DVBT_USB_COLD) }, > +[1] = { USB_DEVICE(USB_VID_WIDEVIEW, > USB_PID_AVERMEDIA_DVBT_USB_WARM) }, While here, please properly indent this table, and respect the 80-columns limit, e. g.: static struct usb_device_id dibusb_dib3000mb_table [] = { [0] = { USB_DEVICE(USB_VID_WIDEVIEW USB_PID_AVERMEDIA_DVBT_USB_COLD) }, [1] = { USB_DEVICE(USB_VID_WIDEVIEW, USB_PID_AVERMEDIA_DVBT_USB_WARM) }, ... Regards, Mauro > +[2] = { USB_DEVICE(USB_VID_COMPRO, > USB_PID_COMPRO_DVBU2000_COLD) }, > +[3] = { USB_DEVICE(USB_VID_COMPRO, > USB_PID_COMPRO_DVBU2000_WARM) }, > +[4] = { USB_DEVICE(USB_VID_COMPRO_UNK, > USB_PID_COMPRO_DVBU2000_UNK_COLD) }, > +[5] = { USB_DEVICE(USB_VID_DIBCOM, > USB_PID_DIBCOM_MOD3000_COLD) }, > +[6] = { USB_DEVICE(USB_VID_DIBCOM, > USB_PID_DIBCOM_MOD3000_WARM) }, > +[7] = { USB_DEVICE(USB_VID_EMPIA, > USB_PID_KWORLD_VSTREAM_COLD) }, > +[8] = { USB_DEVICE(USB_VID_EMPIA, > USB_PID_KWORLD_VSTREAM_WARM) }, > +[9] = { USB_DEVICE(USB_VID_GRANDTEC, > USB_PID_GRANDTEC_DVBT_USB_COLD) }, > +[10] = { USB_DEVICE(USB_VID_GRANDTEC, > USB_PID_GRANDTEC_DVBT_USB_WARM) }, > +[11] = { USB_DEVICE(USB_VID_GRANDTEC, > USB_PID_DIBCOM_MOD3000_COLD) }, > +[12] = { USB_DEVICE(USB_VID_GRANDTEC, > USB_PID_DIBCOM_MOD3000_WARM) }, > +[13] = { USB_DEVICE(USB_VID_HYPER_PALTEK, > USB_PID_UNK_HYPER_PALTEK_COLD) }, > +[14] = { USB_DEVICE(USB_VID_HYPER_PALTEK, > USB_PID_UNK_HYPER_PALTEK_WARM) }, > +[15] = { USB_DEVICE(USB_VID_VISIONPLUS, > USB_PID_TWINHAN_VP7041_COLD) }, > +[16] = { USB_DEVICE(USB_VID_VISIONPLUS, > USB_PI