Sparse warnings triggered truncating the IDs of some platform device
tables. Unfortunately kbl_da7219_max98373 was also truncated.
This patch is reverting the original ID.
Tested on Atlas chromebook.
Fixes: 94efd726b947 ("ASoC: Intel: kbl_da7219_max98357a: shrink platform_id below 20 characters")
Cc: <[email protected]> # 5.4+
Tested-by: Lukasz Majczak <[email protected]>
Signed-off-by: Lukasz Majczak <[email protected]>
Suggested-by: Cezary Rojewski <[email protected]>
---
sound/soc/intel/common/soc-acpi-intel-kbl-match.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sound/soc/intel/common/soc-acpi-intel-kbl-match.c b/sound/soc/intel/common/soc-acpi-intel-kbl-match.c
index 741bf2f9e081..8cab91a00b1a 100644
--- a/sound/soc/intel/common/soc-acpi-intel-kbl-match.c
+++ b/sound/soc/intel/common/soc-acpi-intel-kbl-match.c
@@ -113,7 +113,7 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_kbl_machines[] = {
},
{
.id = "DLGS7219",
- .drv_name = "kbl_da7219_mx98373",
+ .drv_name = "kbl_da7219_max98373",
.fw_filename = "intel/dsp_fw_kbl.bin",
.machine_quirk = snd_soc_acpi_codec_list,
.quirk_data = &kbl_7219_98373_codecs,
--
2.33.0.rc2.250.ged5fa647cd-goog
On 8/19/21 3:24 AM, Lukasz Majczak wrote:
> Sparse warnings triggered truncating the IDs of some platform device
> tables. Unfortunately kbl_da7219_max98373 was also truncated.
> This patch is reverting the original ID.
> Tested on Atlas chromebook.
Instead of reverting, how about changing the remaining occurrences of
the old name in the machine driver?
sound/soc/intel/boards/kbl_da7219_max98927.c: if (!strcmp(pdev->name,
"kbl_da7219_max98373") ||
sound/soc/intel/boards/kbl_da7219_max98927.c: .name =
"kbl_da7219_max98373",
>
> Fixes: 94efd726b947 ("ASoC: Intel: kbl_da7219_max98357a: shrink platform_id below 20 characters")
> Cc: <[email protected]> # 5.4+
> Tested-by: Lukasz Majczak <[email protected]>
> Signed-off-by: Lukasz Majczak <[email protected]>
> Suggested-by: Cezary Rojewski <[email protected]>
> ---
> sound/soc/intel/common/soc-acpi-intel-kbl-match.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/sound/soc/intel/common/soc-acpi-intel-kbl-match.c b/sound/soc/intel/common/soc-acpi-intel-kbl-match.c
> index 741bf2f9e081..8cab91a00b1a 100644
> --- a/sound/soc/intel/common/soc-acpi-intel-kbl-match.c
> +++ b/sound/soc/intel/common/soc-acpi-intel-kbl-match.c
> @@ -113,7 +113,7 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_kbl_machines[] = {
> },
> {
> .id = "DLGS7219",
> - .drv_name = "kbl_da7219_mx98373",
> + .drv_name = "kbl_da7219_max98373",
> .fw_filename = "intel/dsp_fw_kbl.bin",
> .machine_quirk = snd_soc_acpi_codec_list,
> .quirk_data = &kbl_7219_98373_codecs,
>
On 2021-08-19 4:30 PM, Pierre-Louis Bossart wrote:
> On 8/19/21 3:24 AM, Lukasz Majczak wrote:
>> Sparse warnings triggered truncating the IDs of some platform device
>> tables. Unfortunately kbl_da7219_max98373 was also truncated.
>> This patch is reverting the original ID.
>> Tested on Atlas chromebook.
>
> Instead of reverting, how about changing the remaining occurrences of
> the old name in the machine driver?
>
> sound/soc/intel/boards/kbl_da7219_max98927.c: if (!strcmp(pdev->name,
> "kbl_da7219_max98373") ||
> sound/soc/intel/boards/kbl_da7219_max98927.c: .name =
> "kbl_da7219_max98373",
Mentioned by 'Fixes' tag patch clearly introduced regression. If we are
to update any name-fields, it's better to have a fresh start and update
all the boards in one-go than doing so separately.
Apart from that, Maxim codecs go by the name of 'max' in
sound/soc/codecs/. It's more intuitive to have equivalent shortcut used
in board's name.
Regards,
Czarek
On 8/19/21 10:06 AM, Cezary Rojewski wrote:
> On 2021-08-19 4:30 PM, Pierre-Louis Bossart wrote:
>> On 8/19/21 3:24 AM, Lukasz Majczak wrote:
>>> Sparse warnings triggered truncating the IDs of some platform device
>>> tables. Unfortunately kbl_da7219_max98373 was also truncated.
>>> This patch is reverting the original ID.
>>> Tested on Atlas chromebook.
>>
>> Instead of reverting, how about changing the remaining occurrences of
>> the old name in the machine driver?
>>
>> sound/soc/intel/boards/kbl_da7219_max98927.c: if (!strcmp(pdev->name,
>> "kbl_da7219_max98373") ||
>> sound/soc/intel/boards/kbl_da7219_max98927.c: .name =
>> "kbl_da7219_max98373",
>
> Mentioned by 'Fixes' tag patch clearly introduced regression. If we are
> to update any name-fields, it's better to have a fresh start and update
> all the boards in one-go than doing so separately.
>
> Apart from that, Maxim codecs go by the name of 'max' in
> sound/soc/codecs/. It's more intuitive to have equivalent shortcut used
> in board's name.
the ACPI HID start with MX and there's not much consistency in naming,
is there?
.drv_name = "kbl_r5514_5663_max",
.drv_name = "kbl_rt5663_m98927",
.drv_name = "kbl_da7219_mx98357a",
.drv_name = "kbl_da7219_max98927",
.drv_name = "kbl_max98373",
Reviewed-by: Pierre-Louis Bossart <[email protected]>
On Thu, Aug 19, 2021 at 8:18 AM Pierre-Louis Bossart
<[email protected]> wrote:
>
>
> >
> > Apart from that, Maxim codecs go by the name of 'max' in
> > sound/soc/codecs/. It's more intuitive to have equivalent shortcut used
> > in board's name.
>
> the ACPI HID start with MX and there's not much consistency in naming,
> is there?
>
> .drv_name = "kbl_r5514_5663_max",
> .drv_name = "kbl_rt5663_m98927",
> .drv_name = "kbl_da7219_mx98357a",
> .drv_name = "kbl_da7219_max98927",
> .drv_name = "kbl_max98373",
>
> Reviewed-by: Pierre-Louis Bossart <[email protected]>
Agreed, it is definitely better to revisit and get it all in one go so
we don't end up with a cherry-picking nightmare
Acked-by: Curtis Malainey <[email protected]>