* [alsa-devel] [PATCH 1/2] ASoC: improve the DMI long card code in asoc-core
@ 2019-11-20 9:37 Jaroslav Kysela
2019-11-20 9:37 ` [alsa-devel] [PATCH 2/2] ASoC: DMI long name - avoid to add board name if matches with product name Jaroslav Kysela
2019-11-20 14:55 ` [alsa-devel] [PATCH 1/2] ASoC: improve the DMI long card code in asoc-core Pierre-Louis Bossart
0 siblings, 2 replies; 4+ messages in thread
From: Jaroslav Kysela @ 2019-11-20 9:37 UTC (permalink / raw)
To: ALSA development; +Cc: Takashi Iwai, Mark Brown
Add append_dmi_string() function and make the code more readable.
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
Cc: Mark Brown <broonie@kernel.org>
---
sound/soc/soc-core.c | 66 +++++++++++++++++---------------------------
1 file changed, 25 insertions(+), 41 deletions(-)
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index b4683d4588ee..1d1baf78818c 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -1755,6 +1755,23 @@ static int is_dmi_valid(const char *field)
return 1;
}
+/*
+ *
+ */
+static void append_dmi_string(struct snd_soc_card *card, const char *str)
+{
+ char *dst = card->dmi_longname;
+ size_t dst_len = sizeof(card->dmi_longname);
+ size_t len;
+
+ len = strlen(dst);
+ snprintf(dst + len, dst_len - len, "-%s", str);
+
+ len++; /* skip the separator "-" */
+ if (len < dst_len)
+ cleanup_dmi_name(dst + len);
+}
+
/**
* snd_soc_set_dmi_name() - Register DMI names to card
* @card: The card to register DMI names
@@ -1789,61 +1806,36 @@ static int is_dmi_valid(const char *field)
int snd_soc_set_dmi_name(struct snd_soc_card *card, const char *flavour)
{
const char *vendor, *product, *product_version, *board;
- size_t longname_buf_size = sizeof(card->snd_card->longname);
- size_t len;
if (card->long_name)
return 0; /* long name already set by driver or from DMI */
- /* make up dmi long name as: vendor.product.version.board */
+ /* make up dmi long name as: vendor-product-version-board */
vendor = dmi_get_system_info(DMI_BOARD_VENDOR);
if (!vendor || !is_dmi_valid(vendor)) {
dev_warn(card->dev, "ASoC: no DMI vendor name!\n");
return 0;
}
- snprintf(card->dmi_longname, sizeof(card->snd_card->longname),
- "%s", vendor);
+ snprintf(card->dmi_longname, sizeof(card->dmi_longname), "%s", vendor);
cleanup_dmi_name(card->dmi_longname);
product = dmi_get_system_info(DMI_PRODUCT_NAME);
if (product && is_dmi_valid(product)) {
- len = strlen(card->dmi_longname);
- snprintf(card->dmi_longname + len,
- longname_buf_size - len,
- "-%s", product);
-
- len++; /* skip the separator "-" */
- if (len < longname_buf_size)
- cleanup_dmi_name(card->dmi_longname + len);
+ append_dmi_string(card, product);
/*
* some vendors like Lenovo may only put a self-explanatory
* name in the product version field
*/
product_version = dmi_get_system_info(DMI_PRODUCT_VERSION);
- if (product_version && is_dmi_valid(product_version)) {
- len = strlen(card->dmi_longname);
- snprintf(card->dmi_longname + len,
- longname_buf_size - len,
- "-%s", product_version);
-
- len++;
- if (len < longname_buf_size)
- cleanup_dmi_name(card->dmi_longname + len);
- }
+ if (product_version && is_dmi_valid(product_version))
+ append_dmi_string(card, product_version);
}
board = dmi_get_system_info(DMI_BOARD_NAME);
if (board && is_dmi_valid(board)) {
- len = strlen(card->dmi_longname);
- snprintf(card->dmi_longname + len,
- longname_buf_size - len,
- "-%s", board);
-
- len++;
- if (len < longname_buf_size)
- cleanup_dmi_name(card->dmi_longname + len);
+ append_dmi_string(card, board);
} else if (!product) {
/* fall back to using legacy name */
dev_warn(card->dev, "ASoC: no DMI board/product name!\n");
@@ -1851,16 +1843,8 @@ int snd_soc_set_dmi_name(struct snd_soc_card *card, const char *flavour)
}
/* Add flavour to dmi long name */
- if (flavour) {
- len = strlen(card->dmi_longname);
- snprintf(card->dmi_longname + len,
- longname_buf_size - len,
- "-%s", flavour);
-
- len++;
- if (len < longname_buf_size)
- cleanup_dmi_name(card->dmi_longname + len);
- }
+ if (flavour)
+ append_dmi_string(card, flavour);
/* set the card long name */
card->long_name = card->dmi_longname;
--
2.20.1
_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
https://mailman.alsa-project.org/mailman/listinfo/alsa-devel
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [alsa-devel] [PATCH 2/2] ASoC: DMI long name - avoid to add board name if matches with product name
2019-11-20 9:37 [alsa-devel] [PATCH 1/2] ASoC: improve the DMI long card code in asoc-core Jaroslav Kysela
@ 2019-11-20 9:37 ` Jaroslav Kysela
2019-11-20 14:55 ` [alsa-devel] [PATCH 1/2] ASoC: improve the DMI long card code in asoc-core Pierre-Louis Bossart
1 sibling, 0 replies; 4+ messages in thread
From: Jaroslav Kysela @ 2019-11-20 9:37 UTC (permalink / raw)
To: ALSA development; +Cc: Takashi Iwai, Mark Brown
Current code:
LENOVO-20QE000VMC-ThinkPadX1Carbon7th-20QE000VMC
With the patch:
LENOVO-20QE000VMC-ThinkPadX1Carbon7th
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
Cc: Mark Brown <broonie@kernel.org>
---
sound/soc/soc-core.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 1d1baf78818c..32c249ccc600 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -1835,7 +1835,8 @@ int snd_soc_set_dmi_name(struct snd_soc_card *card, const char *flavour)
board = dmi_get_system_info(DMI_BOARD_NAME);
if (board && is_dmi_valid(board)) {
- append_dmi_string(card, board);
+ if (!product || strcasecmp(board, product))
+ append_dmi_string(card, board);
} else if (!product) {
/* fall back to using legacy name */
dev_warn(card->dev, "ASoC: no DMI board/product name!\n");
--
2.20.1
_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
https://mailman.alsa-project.org/mailman/listinfo/alsa-devel
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [alsa-devel] [PATCH 1/2] ASoC: improve the DMI long card code in asoc-core
2019-11-20 9:37 [alsa-devel] [PATCH 1/2] ASoC: improve the DMI long card code in asoc-core Jaroslav Kysela
2019-11-20 9:37 ` [alsa-devel] [PATCH 2/2] ASoC: DMI long name - avoid to add board name if matches with product name Jaroslav Kysela
@ 2019-11-20 14:55 ` Pierre-Louis Bossart
2019-11-20 17:28 ` Jaroslav Kysela
1 sibling, 1 reply; 4+ messages in thread
From: Pierre-Louis Bossart @ 2019-11-20 14:55 UTC (permalink / raw)
To: Jaroslav Kysela, ALSA development; +Cc: Takashi Iwai, Mark Brown
On 11/20/19 3:37 AM, Jaroslav Kysela wrote:
> Add append_dmi_string() function and make the code more readable.
>
> Signed-off-by: Jaroslav Kysela <perex@perex.cz>
> Cc: Mark Brown <broonie@kernel.org>
> ---
> sound/soc/soc-core.c | 66 +++++++++++++++++---------------------------
> 1 file changed, 25 insertions(+), 41 deletions(-)
>
> diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
> index b4683d4588ee..1d1baf78818c 100644
> --- a/sound/soc/soc-core.c
> +++ b/sound/soc/soc-core.c
> @@ -1755,6 +1755,23 @@ static int is_dmi_valid(const char *field)
> return 1;
> }
>
> +/*
> + *
> + */
unneeded comments or missing text?
> +static void append_dmi_string(struct snd_soc_card *card, const char *str)
> +{
> + char *dst = card->dmi_longname;
> + size_t dst_len = sizeof(card->dmi_longname);
> + size_t len;
> +
> + len = strlen(dst);
> + snprintf(dst + len, dst_len - len, "-%s", str);
> +
> + len++; /* skip the separator "-" */
> + if (len < dst_len)
> + cleanup_dmi_name(dst + len);
> +}
> +
> /**
> * snd_soc_set_dmi_name() - Register DMI names to card
> * @card: The card to register DMI names
> @@ -1789,61 +1806,36 @@ static int is_dmi_valid(const char *field)
> int snd_soc_set_dmi_name(struct snd_soc_card *card, const char *flavour)
> {
> const char *vendor, *product, *product_version, *board;
> - size_t longname_buf_size = sizeof(card->snd_card->longname);
> - size_t len;
>
> if (card->long_name)
> return 0; /* long name already set by driver or from DMI */
>
> - /* make up dmi long name as: vendor.product.version.board */
> + /* make up dmi long name as: vendor-product-version-board */
here you are just fixing a misleading comment, yes?
I don't see any dots to dashes substitution but better ask.
_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
https://mailman.alsa-project.org/mailman/listinfo/alsa-devel
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [alsa-devel] [PATCH 1/2] ASoC: improve the DMI long card code in asoc-core
2019-11-20 14:55 ` [alsa-devel] [PATCH 1/2] ASoC: improve the DMI long card code in asoc-core Pierre-Louis Bossart
@ 2019-11-20 17:28 ` Jaroslav Kysela
0 siblings, 0 replies; 4+ messages in thread
From: Jaroslav Kysela @ 2019-11-20 17:28 UTC (permalink / raw)
To: Pierre-Louis Bossart, ALSA development; +Cc: Takashi Iwai, Mark Brown
Dne 20. 11. 19 v 15:55 Pierre-Louis Bossart napsal(a):
>
>
> On 11/20/19 3:37 AM, Jaroslav Kysela wrote:
>> Add append_dmi_string() function and make the code more readable.
>>
>> Signed-off-by: Jaroslav Kysela <perex@perex.cz>
>> Cc: Mark Brown <broonie@kernel.org>
>> ---
>> sound/soc/soc-core.c | 66 +++++++++++++++++---------------------------
>> 1 file changed, 25 insertions(+), 41 deletions(-)
>>
>> diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
>> index b4683d4588ee..1d1baf78818c 100644
>> --- a/sound/soc/soc-core.c
>> +++ b/sound/soc/soc-core.c
>> @@ -1755,6 +1755,23 @@ static int is_dmi_valid(const char *field)
>> return 1;
>> }
>>
>> +/*
>> + *
>> + */
>
> unneeded comments or missing text?
There should be a text, of course.
>> +static void append_dmi_string(struct snd_soc_card *card, const char *str)
>> +{
>> + char *dst = card->dmi_longname;
>> + size_t dst_len = sizeof(card->dmi_longname);
>> + size_t len;
>> +
>> + len = strlen(dst);
>> + snprintf(dst + len, dst_len - len, "-%s", str);
>> +
>> + len++; /* skip the separator "-" */
>> + if (len < dst_len)
>> + cleanup_dmi_name(dst + len);
>> +}
>> +
>> /**
>> * snd_soc_set_dmi_name() - Register DMI names to card
>> * @card: The card to register DMI names
>> @@ -1789,61 +1806,36 @@ static int is_dmi_valid(const char *field)
>> int snd_soc_set_dmi_name(struct snd_soc_card *card, const char *flavour)
>> {
>> const char *vendor, *product, *product_version, *board;
>> - size_t longname_buf_size = sizeof(card->snd_card->longname);
>> - size_t len;
>>
>> if (card->long_name)
>> return 0; /* long name already set by driver or from DMI */
>>
>> - /* make up dmi long name as: vendor.product.version.board */
>> + /* make up dmi long name as: vendor-product-version-board */
>
> here you are just fixing a misleading comment, yes?
> I don't see any dots to dashes substitution but better ask.
The result is LENOVO-20QE000VMC-ThinkPadX1Carbon7th-20QE000VMC. I think that
the dots were replaced by dashes as the field separators during the initial
implementation or so. I just reflect the current state.
Jaroslav
--
Jaroslav Kysela <perex@perex.cz>
Linux Sound Maintainer; ALSA Project; Red Hat, Inc.
_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
https://mailman.alsa-project.org/mailman/listinfo/alsa-devel
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2019-11-20 17:29 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-11-20 9:37 [alsa-devel] [PATCH 1/2] ASoC: improve the DMI long card code in asoc-core Jaroslav Kysela
2019-11-20 9:37 ` [alsa-devel] [PATCH 2/2] ASoC: DMI long name - avoid to add board name if matches with product name Jaroslav Kysela
2019-11-20 14:55 ` [alsa-devel] [PATCH 1/2] ASoC: improve the DMI long card code in asoc-core Pierre-Louis Bossart
2019-11-20 17:28 ` Jaroslav Kysela
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).