2021-03-11 13:29:02

by Andy Shevchenko

[permalink] [raw]
Subject: [PATCH v1 1/1] ALSA: hda/realtek: Sort alphanumerically the HDA_CODEC_ENTRY() entries.

Sort alphanumerically the HDA_CODEC_ENTRY() entries for better maintenance.
No functional change implied.

Note, that HDA_CODEC_REV_ENTRY() goes after HDA_CODEC_ENTRY() as per
default value in the latter macro.

Signed-off-by: Andy Shevchenko <[email protected]>
---
sound/pci/hda/patch_realtek.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index d23c8c2e6833..c9e62693db6d 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -10341,10 +10341,7 @@ static const struct hda_device_id snd_hda_id_realtek[] = {
HDA_CODEC_ENTRY(0x10ec0299, "ALC299", patch_alc269),
HDA_CODEC_ENTRY(0x10ec0300, "ALC300", patch_alc269),
HDA_CODEC_ENTRY(0x10ec0623, "ALC623", patch_alc269),
- HDA_CODEC_REV_ENTRY(0x10ec0861, 0x100340, "ALC660", patch_alc861),
HDA_CODEC_ENTRY(0x10ec0660, "ALC660-VD", patch_alc861vd),
- HDA_CODEC_ENTRY(0x10ec0861, "ALC861", patch_alc861),
- HDA_CODEC_ENTRY(0x10ec0862, "ALC861-VD", patch_alc861vd),
HDA_CODEC_REV_ENTRY(0x10ec0662, 0x100002, "ALC662 rev2", patch_alc882),
HDA_CODEC_REV_ENTRY(0x10ec0662, 0x100101, "ALC662 rev1", patch_alc662),
HDA_CODEC_REV_ENTRY(0x10ec0662, 0x100300, "ALC662 rev3", patch_alc662),
@@ -10359,16 +10356,19 @@ static const struct hda_device_id snd_hda_id_realtek[] = {
HDA_CODEC_ENTRY(0x10ec0701, "ALC701", patch_alc269),
HDA_CODEC_ENTRY(0x10ec0703, "ALC703", patch_alc269),
HDA_CODEC_ENTRY(0x10ec0711, "ALC711", patch_alc269),
+ HDA_CODEC_ENTRY(0x10ec0861, "ALC861", patch_alc861),
+ HDA_CODEC_REV_ENTRY(0x10ec0861, 0x100340, "ALC660", patch_alc861),
+ HDA_CODEC_ENTRY(0x10ec0862, "ALC861-VD", patch_alc861vd),
HDA_CODEC_ENTRY(0x10ec0867, "ALC891", patch_alc662),
HDA_CODEC_ENTRY(0x10ec0880, "ALC880", patch_alc880),
HDA_CODEC_ENTRY(0x10ec0882, "ALC882", patch_alc882),
HDA_CODEC_ENTRY(0x10ec0883, "ALC883", patch_alc882),
+ HDA_CODEC_ENTRY(0x10ec0885, "ALC885", patch_alc882),
HDA_CODEC_REV_ENTRY(0x10ec0885, 0x100101, "ALC889A", patch_alc882),
HDA_CODEC_REV_ENTRY(0x10ec0885, 0x100103, "ALC889A", patch_alc882),
- HDA_CODEC_ENTRY(0x10ec0885, "ALC885", patch_alc882),
HDA_CODEC_ENTRY(0x10ec0887, "ALC887", patch_alc882),
- HDA_CODEC_REV_ENTRY(0x10ec0888, 0x100101, "ALC1200", patch_alc882),
HDA_CODEC_ENTRY(0x10ec0888, "ALC888", patch_alc882),
+ HDA_CODEC_REV_ENTRY(0x10ec0888, 0x100101, "ALC1200", patch_alc882),
HDA_CODEC_ENTRY(0x10ec0889, "ALC889", patch_alc882),
HDA_CODEC_ENTRY(0x10ec0892, "ALC892", patch_alc662),
HDA_CODEC_ENTRY(0x10ec0897, "ALC897", patch_alc662),
--
2.30.1


2021-03-11 13:38:02

by Takashi Iwai

[permalink] [raw]
Subject: Re: [PATCH v1 1/1] ALSA: hda/realtek: Sort alphanumerically the HDA_CODEC_ENTRY() entries.

On Thu, 11 Mar 2021 14:27:48 +0100,
Andy Shevchenko wrote:
>
> Sort alphanumerically the HDA_CODEC_ENTRY() entries for better maintenance.
> No functional change implied.
>
> Note, that HDA_CODEC_REV_ENTRY() goes after HDA_CODEC_ENTRY() as per
> default value in the latter macro.

This breaks the matching rule. Please put the HDA_CODEC_REV_ENTRY()
before the HDA_CODEC_ENTRY().


Takashi

2021-03-11 14:02:47

by Andy Shevchenko

[permalink] [raw]
Subject: Re: [PATCH v1 1/1] ALSA: hda/realtek: Sort alphanumerically the HDA_CODEC_ENTRY() entries.

On Thu, Mar 11, 2021 at 3:36 PM Takashi Iwai <[email protected]> wrote:
>
> On Thu, 11 Mar 2021 14:27:48 +0100,
> Andy Shevchenko wrote:
> >
> > Sort alphanumerically the HDA_CODEC_ENTRY() entries for better maintenance.
> > No functional change implied.
> >
> > Note, that HDA_CODEC_REV_ENTRY() goes after HDA_CODEC_ENTRY() as per
> > default value in the latter macro.
>
> This breaks the matching rule. Please put the HDA_CODEC_REV_ENTRY()
> before the HDA_CODEC_ENTRY().

Oh, indeed. What I was thinking about... :-)
Thanks!

--
With Best Regards,
Andy Shevchenko