| Message ID | 20180105205536.10366-5-pierre-louis.bossart@linux.intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Fri, Jan 05, 2018 at 02:55:36PM -0600, Pierre-Louis Bossart wrote: > Remove hard-coded [16] array size, replace with clearer description and > dependency on ACPI_ID_LEN > No functionality change > > Suggested-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> > Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> > --- > include/sound/soc-acpi.h | 3 +++ > sound/soc/intel/boards/bytcht_da7213.c | 2 +- > sound/soc/intel/boards/bytcht_es8316.c | 2 +- > sound/soc/intel/boards/bytcr_rt5640.c | 2 +- > sound/soc/intel/boards/bytcr_rt5651.c | 2 +- > sound/soc/intel/boards/cht_bsw_rt5645.c | 4 ++-- > sound/soc/intel/boards/cht_bsw_rt5672.c | 2 +- > 7 files changed, 10 insertions(+), 7 deletions(-) > > diff --git a/include/sound/soc-acpi.h b/include/sound/soc-acpi.h > index d1aaf876cd26..703c78483113 100644 > --- a/include/sound/soc-acpi.h > +++ b/include/sound/soc-acpi.h > @@ -27,6 +27,9 @@ struct snd_soc_acpi_package_context { > bool data_valid; > }; > > +/* codec name is used in DAIs is i2c-<HID>:00 with HID being 8 chars */ > +#define SND_SOC_ACPI_I2C_DEVICE_NAME_LEN (4 + ACPI_ID_LEN + 3 + 1) nitpicking, thats a very long name :( how about SND_ACPI_I2C_ID_LEN, we can drop SOC. And replace DEVICE_NAME with ID
On 1/7/18 10:41 PM, Vinod Koul wrote: > On Fri, Jan 05, 2018 at 02:55:36PM -0600, Pierre-Louis Bossart wrote: >> Remove hard-coded [16] array size, replace with clearer description and >> dependency on ACPI_ID_LEN >> No functionality change >> >> Suggested-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> >> Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> >> --- >> include/sound/soc-acpi.h | 3 +++ >> sound/soc/intel/boards/bytcht_da7213.c | 2 +- >> sound/soc/intel/boards/bytcht_es8316.c | 2 +- >> sound/soc/intel/boards/bytcr_rt5640.c | 2 +- >> sound/soc/intel/boards/bytcr_rt5651.c | 2 +- >> sound/soc/intel/boards/cht_bsw_rt5645.c | 4 ++-- >> sound/soc/intel/boards/cht_bsw_rt5672.c | 2 +- >> 7 files changed, 10 insertions(+), 7 deletions(-) >> >> diff --git a/include/sound/soc-acpi.h b/include/sound/soc-acpi.h >> index d1aaf876cd26..703c78483113 100644 >> --- a/include/sound/soc-acpi.h >> +++ b/include/sound/soc-acpi.h >> @@ -27,6 +27,9 @@ struct snd_soc_acpi_package_context { >> bool data_valid; >> }; >> >> +/* codec name is used in DAIs is i2c-<HID>:00 with HID being 8 chars */ >> +#define SND_SOC_ACPI_I2C_DEVICE_NAME_LEN (4 + ACPI_ID_LEN + 3 + 1) > > nitpicking, thats a very long name :( > > how about SND_ACPI_I2C_ID_LEN, we can drop SOC. And replace DEVICE_NAME with ID Fine with me. Andy do you concur or have a more precise suggestion?
On Mon, 2018-01-08 at 14:28 -0600, Pierre-Louis Bossart wrote: > On 1/7/18 10:41 PM, Vinod Koul wrote: > > On Fri, Jan 05, 2018 at 02:55:36PM -0600, Pierre-Louis Bossart > > wrote: > > > Remove hard-coded [16] array size, replace with clearer > > > description and > > > dependency on ACPI_ID_LEN > > > > > > > > > +/* codec name is used in DAIs is i2c-<HID>:00 with HID being 8 > > > chars */ > > > +#define SND_SOC_ACPI_I2C_DEVICE_NAME_LEN (4 + ACPI_ID_LEN + 3 + > > > 1) > > > > nitpicking, thats a very long name :( > > > > how about SND_ACPI_I2C_ID_LEN, we can drop SOC. And replace > > DEVICE_NAME with ID > > Fine with me. Andy do you concur or have a more precise suggestion? Looks sane to me. Thank you, Vinod, for a suggestion.
diff --git a/include/sound/soc-acpi.h b/include/sound/soc-acpi.h index d1aaf876cd26..703c78483113 100644 --- a/include/sound/soc-acpi.h +++ b/include/sound/soc-acpi.h @@ -27,6 +27,9 @@ struct snd_soc_acpi_package_context { bool data_valid; }; +/* codec name is used in DAIs is i2c-<HID>:00 with HID being 8 chars */ +#define SND_SOC_ACPI_I2C_DEVICE_NAME_LEN (4 + ACPI_ID_LEN + 3 + 1) + #if IS_ENABLED(CONFIG_ACPI) /* translation fron HID to I2C name, needed for DAI codec_name */ const char *snd_soc_acpi_find_name_from_hid(const u8 hid[ACPI_ID_LEN]); diff --git a/sound/soc/intel/boards/bytcht_da7213.c b/sound/soc/intel/boards/bytcht_da7213.c index c4d82ad41bd7..06c6a5deb071 100644 --- a/sound/soc/intel/boards/bytcht_da7213.c +++ b/sound/soc/intel/boards/bytcht_da7213.c @@ -219,7 +219,7 @@ static struct snd_soc_card bytcht_da7213_card = { .num_dapm_routes = ARRAY_SIZE(audio_map), }; -static char codec_name[16]; /* i2c-<HID>:00 with HID being 8 chars */ +static char codec_name[SND_SOC_ACPI_I2C_DEVICE_NAME_LEN]; static int bytcht_da7213_probe(struct platform_device *pdev) { diff --git a/sound/soc/intel/boards/bytcht_es8316.c b/sound/soc/intel/boards/bytcht_es8316.c index ae24f6205f05..0da04ebc118e 100644 --- a/sound/soc/intel/boards/bytcht_es8316.c +++ b/sound/soc/intel/boards/bytcht_es8316.c @@ -232,7 +232,7 @@ static struct snd_soc_card byt_cht_es8316_card = { .fully_routed = true, }; -static char codec_name[16]; /* i2c-<HID>:00 with HID being 8 chars */ +static char codec_name[SND_SOC_ACPI_I2C_DEVICE_NAME_LEN]; static int snd_byt_cht_es8316_mc_probe(struct platform_device *pdev) { diff --git a/sound/soc/intel/boards/bytcr_rt5640.c b/sound/soc/intel/boards/bytcr_rt5640.c index f2c0fc415e52..e7bbbc0eba55 100644 --- a/sound/soc/intel/boards/bytcr_rt5640.c +++ b/sound/soc/intel/boards/bytcr_rt5640.c @@ -713,7 +713,7 @@ static struct snd_soc_card byt_rt5640_card = { .fully_routed = true, }; -static char byt_rt5640_codec_name[16]; /* i2c-<HID>:00 with HID being 8 chars */ +static char byt_rt5640_codec_name[SND_SOC_ACPI_I2C_DEVICE_NAME_LEN]; static char byt_rt5640_codec_aif_name[12]; /* = "rt5640-aif[1|2]" */ static char byt_rt5640_cpu_dai_name[10]; /* = "ssp[0|2]-port" */ diff --git a/sound/soc/intel/boards/bytcr_rt5651.c b/sound/soc/intel/boards/bytcr_rt5651.c index 488ec48f296a..23966105a494 100644 --- a/sound/soc/intel/boards/bytcr_rt5651.c +++ b/sound/soc/intel/boards/bytcr_rt5651.c @@ -481,7 +481,7 @@ static struct snd_soc_card byt_rt5651_card = { .fully_routed = true, }; -static char byt_rt5651_codec_name[16]; /* i2c-<HID>:00 with HID being 8 chars */ +static char byt_rt5651_codec_name[SND_SOC_ACPI_I2C_DEVICE_NAME_LEN]; static int snd_byt_rt5651_mc_probe(struct platform_device *pdev) { diff --git a/sound/soc/intel/boards/cht_bsw_rt5645.c b/sound/soc/intel/boards/cht_bsw_rt5645.c index f898ee140cdc..50acb55fe153 100644 --- a/sound/soc/intel/boards/cht_bsw_rt5645.c +++ b/sound/soc/intel/boards/cht_bsw_rt5645.c @@ -49,7 +49,7 @@ struct cht_acpi_card { struct cht_mc_private { struct snd_soc_jack jack; struct cht_acpi_card *acpi_card; - char codec_name[16]; + char codec_name[SND_SOC_ACPI_I2C_DEVICE_NAME_LEN]; struct clk *mclk; }; @@ -506,7 +506,7 @@ static struct cht_acpi_card snd_soc_cards[] = { {"10EC5650", CODEC_TYPE_RT5650, &snd_soc_card_chtrt5650}, }; -static char cht_rt5645_codec_name[16]; /* i2c-<HID>:00 with HID being 8 chars */ +static char cht_rt5645_codec_name[SND_SOC_ACPI_I2C_DEVICE_NAME_LEN]; static char cht_rt5645_codec_aif_name[12]; /* = "rt5645-aif[1|2]" */ static char cht_rt5645_cpu_dai_name[10]; /* = "ssp[0|2]-port" */ diff --git a/sound/soc/intel/boards/cht_bsw_rt5672.c b/sound/soc/intel/boards/cht_bsw_rt5672.c index f8f21eee9b2d..b1decdacbae7 100644 --- a/sound/soc/intel/boards/cht_bsw_rt5672.c +++ b/sound/soc/intel/boards/cht_bsw_rt5672.c @@ -35,7 +35,7 @@ struct cht_mc_private { struct snd_soc_jack headset; - char codec_name[16]; + char codec_name[SND_SOC_ACPI_I2C_DEVICE_NAME_LEN]; struct clk *mclk; };
Remove hard-coded [16] array size, replace with clearer description and dependency on ACPI_ID_LEN No functionality change Suggested-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> --- include/sound/soc-acpi.h | 3 +++ sound/soc/intel/boards/bytcht_da7213.c | 2 +- sound/soc/intel/boards/bytcht_es8316.c | 2 +- sound/soc/intel/boards/bytcr_rt5640.c | 2 +- sound/soc/intel/boards/bytcr_rt5651.c | 2 +- sound/soc/intel/boards/cht_bsw_rt5645.c | 4 ++-- sound/soc/intel/boards/cht_bsw_rt5672.c | 2 +- 7 files changed, 10 insertions(+), 7 deletions(-)