From: Mauro Carvalho Chehab <mchehab@kernel.org>
To: Larry Finger <Larry.Finger@lwfinger.net>
Cc: "Joe Perches" <joe@perches.com>,
"Benjamin Stürz" <benni@stuerz.xyz>,
andrew@lunn.ch, sebastian.hesselbarth@gmail.com,
gregory.clement@bootlin.com, linux@armlinux.org.uk,
linux@simtec.co.uk, krzk@kernel.org, alim.akhtar@samsung.com,
tglx@linutronix.de, mingo@redhat.com, bp@alien8.de,
dave.hansen@linux.intel.com, hpa@zytor.com,
robert.moore@intel.com, rafael.j.wysocki@intel.com,
lenb@kernel.org, 3chas3@gmail.com, laforge@gnumonks.org,
arnd@arndb.de, gregkh@linuxfoundation.org, tony.luck@intel.com,
james.morse@arm.com, rric@kernel.org, linus.walleij@linaro.org,
brgl@bgdev.pl, mike.marciniszyn@cornelisnetworks.com,
dennis.dalessandro@cornelisnetworks.com, jgg@ziepe.ca,
pali@kernel.org, dmitry.torokhov@gmail.com, isdn@linux-pingi.de,
benh@kernel.crashing.org, fbarrat@linux.ibm.com,
ajd@linux.ibm.com, davem@davemloft.net, kuba@kernel.org,
pabeni@redhat.com, nico@fluxnic.net, loic.poulain@linaro.org,
kvalo@kernel.org, pkshih@realtek.com, bhelgaas@google.com,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, linux-samsung-soc@vger.kernel.org,
linux-ia64@vger.kernel.org, linux-acpi@vger.kernel.org,
devel@acpica.org, linux-atm-general@lists.sourceforge.net,
netdev@vger.kernel.org, linux-edac@vger.kernel.org,
linux-gpio@vger.kernel.org, linux-rdma@vger.kernel.org,
linux-input@vger.kernel.org, linuxppc-dev@lists.ozlabs.org,
linux-media@vger.kernel.org, wcn36xx@lists.infradead.org,
linux-wireless@vger.kernel.org, linux-pci@vger.kernel.org
Subject: Re: [PATCH 16/22] dvb-usb: Replace comments with C99 initializers
Date: Sat, 26 Mar 2022 22:08:32 +0100 [thread overview]
Message-ID: <20220326220832.12b4e91b@coco.lan> (raw)
In-Reply-To: <bc2d4f83-0674-ccae-71c8-14427de59f96@lwfinger.net>
Em Sat, 26 Mar 2022 15:11:46 -0500
Larry Finger <Larry.Finger@lwfinger.net> 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 <mchehab@kernel.org> escreveu:
> >>
> >>> Em Sat, 26 Mar 2022 17:59:03 +0100
> >>> Benjamin Stürz <benni@stuerz.xyz> escreveu:
> >>>
> >>>> This replaces comments with C99's designated
> >>>> initializers because the kernel supports them now.
> >>>>
> >>>> Signed-off-by: Benjamin Stürz <benni@stuerz.xyz>
> >>>> ---
> >>>> 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!
Unfortunately, that's not the case for drivers that use the legacy dvb-usb
core, as it has other tables that reference the device IDs from this table
by number.
The best here would be to do something like:
enum {
AVERMEDIA_DVBT_USB_COLD,
AVERMEDIA_DVBT_USB_WARM,
COMPRO_DVBU2000_COLD,
COMPRO_DVBU2000_WARM,
COMPRO_DVBU2000_UNK_COLD,
DIBCOM_MOD3000_COLD,
DIBCOM_MOD3000_WARM,
KWORLD_VSTREAM_COLD,
KWORLD_VSTREAM_WARM,
GRANDTEC_DVBT_USB_COLD,
GRANDTEC_DVBT_USB_WARM,
DIBCOM_MOD3000_COLD,
DIBCOM_MOD3000_WARM,
UNK_HYPER_PALTEK_COLD,
UNK_HYPER_PALTEK_WARM,
TWINHAN_VP7041_COLD,
TWINHAN_VP7041_WARM,
TWINHAN_VP7041_COLD,
TWINHAN_VP7041_WARM,
ULTIMA_TVBOX_COLD,
ULTIMA_TVBOX_WARM,
ULTIMA_TVBOX_AN2235_COLD,
ULTIMA_TVBOX_AN2235_WARM,
ADSTECH_USB2_COLD,
ADSTECH_USB2_WARM,
KYE_DVB_T_COLD,
KYE_DVB_T_WARM,
KWORLD_VSTREAM_COLD,
ULTIMA_TVBOX_USB2_COLD,
ULTIMA_TVBOX_USB2_WARM,
ULTIMA_TVBOX_ANCHOR_COLD,
};
Then define the table as:
static const struct usb_device_id dibusb_dib3000mb_table[]
{
[AVERMEDIA_DVBT_USB_COLD] = { USB_DEVICE(USB_VID_WIDEVIEW,
USB_PID_AVERMEDIA_DVBT_USB_COLD)
},
[AVERMEDIA_DVBT_USB_WARM] = { USB_DEVICE(USB_VID_WIDEVIEW,
USB_PID_AVERMEDIA_DVBT_USB_WARM)
},
...
}
(eventually, using some macro to help defining them)
Finally, change the other static tables to also use the same name,
e. g.:
static const struct dvb_usb_device_properties dibusb1_1_properties = {
...
.num_device_descs = 9,
.devices = {
{ "AVerMedia AverTV DVBT USB1.1",
{ &dibusb_dib3000mb_table[AVERMEDIA_DVBT_USB_COLD], NULL },
{ &dibusb_dib3000mb_table[AVERMEDIA_DVBT_USB_WARM], NULL },
},
...
};
The same applies to other drivers inside drivers/media/usb/dvb-usb/.
Alternatively, the drivers there should be ported to the newer DVB USB
core (dvb-usb-v2).
Thanks,
Mauro
next prev parent reply other threads:[~2022-03-26 21:08 UTC|newest]
Thread overview: 54+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-26 16:58 [PATCH 01/22] orion5x: Replace comments with C99 initializers Benjamin Stürz
2022-03-26 16:58 ` [PATCH 02/22] s3c: " Benjamin Stürz
2022-03-26 19:44 ` Joe Perches
2022-03-28 13:37 ` Daniel Thompson
2022-03-26 16:58 ` [PATCH 03/22] ia64: " Benjamin Stürz
2022-03-26 16:58 ` [PATCH 04/22] x86: " Benjamin Stürz
2022-03-28 23:08 ` Thomas Gleixner
2022-03-26 16:58 ` [PATCH 05/22] acpica: " Benjamin Stürz
2022-03-27 19:59 ` Andy Shevchenko
2022-03-31 19:27 ` Moore, Robert
2022-04-01 5:09 ` Christoph Hellwig
2022-04-01 5:10 ` Christoph Hellwig
2022-03-28 12:33 ` Rafael J. Wysocki
2022-03-26 16:58 ` [PATCH 06/22] idt77252: " Benjamin Stürz
2022-03-26 16:58 ` [PATCH 07/22] cm4000: " Benjamin Stürz
2022-03-26 16:58 ` [PATCH 08/22] i5100: " Benjamin Stürz
2022-03-26 16:58 ` [PATCH 09/22] gpio-winbond: Use " Benjamin Stürz
2022-03-27 12:03 ` Linus Walleij
2022-03-29 12:30 ` Bartosz Golaszewski
2022-03-26 16:58 ` [PATCH 10/22] hfi1: Replace comments with " Benjamin Stürz
2022-03-26 16:58 ` [PATCH 11/22] rdmavt: " Benjamin Stürz
2022-03-27 7:04 ` Leon Romanovsky
2022-03-31 17:41 ` Dennis Dalessandro
2022-03-26 16:58 ` [PATCH 12/22] alps: " Benjamin Stürz
2022-03-26 16:59 ` [PATCH 13/22] capi: " Benjamin Stürz
2022-03-26 16:59 ` [PATCH 14/22] mISDN: " Benjamin Stürz
2022-03-26 16:59 ` [PATCH 15/22] macintosh: " Benjamin Stürz
2022-03-26 16:59 ` [PATCH 16/22] dvb-usb: " Benjamin Stürz
2022-03-26 18:24 ` Mauro Carvalho Chehab
2022-03-26 18:27 ` Mauro Carvalho Chehab
2022-03-26 19:51 ` Joe Perches
2022-03-26 20:11 ` Larry Finger
2022-03-26 21:08 ` Mauro Carvalho Chehab [this message]
2022-03-26 16:59 ` [PATCH 17/22] cxl: " Benjamin Stürz
2022-03-26 16:59 ` [PATCH 18/22] smsc: " Benjamin Stürz
2022-03-26 16:59 ` [PATCH 19/22] wnc36xx: " Benjamin Stürz
2022-03-28 16:17 ` Jeff Johnson
2022-03-26 16:59 ` [PATCH 20/22] wireless: " Benjamin Stürz
2022-03-28 12:06 ` Kalle Valo
2022-03-26 16:59 ` [PATCH 21/22] rtw89: " Benjamin Stürz
2022-03-26 18:55 ` Larry Finger
2022-03-28 9:28 ` Kalle Valo
2022-03-28 12:21 ` David Laight
2022-03-26 16:59 ` [PATCH 22/22] pci: " Benjamin Stürz
2022-03-26 18:20 ` [PATCH 01/22] orion5x: " Mauro Carvalho Chehab
2022-03-26 19:23 ` Arnd Bergmann
2022-03-28 13:19 ` Segher Boessenkool
2022-03-27 12:46 ` [PATCH 00/22] " Benjamin Stürz
2022-03-28 9:33 ` Kalle Valo
2022-03-28 11:51 ` Benjamin Stürz
2022-03-28 12:31 ` Kalle Valo
2022-03-28 20:20 ` Jakub Kicinski
2022-03-28 13:47 ` Daniel Thompson
2022-03-28 13:17 ` [PATCH 01/22] orion5x: " Daniel Thompson
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=20220326220832.12b4e91b@coco.lan \
--to=mchehab@kernel.org \
--cc=3chas3@gmail.com \
--cc=Larry.Finger@lwfinger.net \
--cc=ajd@linux.ibm.com \
--cc=alim.akhtar@samsung.com \
--cc=andrew@lunn.ch \
--cc=arnd@arndb.de \
--cc=benh@kernel.crashing.org \
--cc=benni@stuerz.xyz \
--cc=bhelgaas@google.com \
--cc=bp@alien8.de \
--cc=brgl@bgdev.pl \
--cc=dave.hansen@linux.intel.com \
--cc=davem@davemloft.net \
--cc=dennis.dalessandro@cornelisnetworks.com \
--cc=devel@acpica.org \
--cc=dmitry.torokhov@gmail.com \
--cc=fbarrat@linux.ibm.com \
--cc=gregkh@linuxfoundation.org \
--cc=gregory.clement@bootlin.com \
--cc=hpa@zytor.com \
--cc=isdn@linux-pingi.de \
--cc=james.morse@arm.com \
--cc=jgg@ziepe.ca \
--cc=joe@perches.com \
--cc=krzk@kernel.org \
--cc=kuba@kernel.org \
--cc=kvalo@kernel.org \
--cc=laforge@gnumonks.org \
--cc=lenb@kernel.org \
--cc=linus.walleij@linaro.org \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-atm-general@lists.sourceforge.net \
--cc=linux-edac@vger.kernel.org \
--cc=linux-gpio@vger.kernel.org \
--cc=linux-ia64@vger.kernel.org \
--cc=linux-input@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=linux-rdma@vger.kernel.org \
--cc=linux-samsung-soc@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=linux@armlinux.org.uk \
--cc=linux@simtec.co.uk \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=loic.poulain@linaro.org \
--cc=mike.marciniszyn@cornelisnetworks.com \
--cc=mingo@redhat.com \
--cc=netdev@vger.kernel.org \
--cc=nico@fluxnic.net \
--cc=pabeni@redhat.com \
--cc=pali@kernel.org \
--cc=pkshih@realtek.com \
--cc=rafael.j.wysocki@intel.com \
--cc=robert.moore@intel.com \
--cc=rric@kernel.org \
--cc=sebastian.hesselbarth@gmail.com \
--cc=tglx@linutronix.de \
--cc=tony.luck@intel.com \
--cc=wcn36xx@lists.infradead.org \
/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).