ALSA: hda: cs35l41: Don't dereference fwnode handle
PATCH v2 1/4 ALSA: hda: cs35l41: Don't dereference fwnode handle
Use acpi_fwnode_handle() instead of dereferencing an fwnode handle directly, which is a better coding practice.
---
v2: new change
sound/pci/hda/cs35l41_hda.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/pci/hda/cs35l41_hda.c +1 -1
@@ -347,7 +347,7 @@ static int cs35l41_hda_read_acpi(struct cs35l41_hda *cs35l41, const char *hid, i/* To use the same release code for all laptop variants we can't use devm_ version of * gpiod_get here, as CLSA010* don't have a fully functional bios with an _DSD node */ - cs35l41->reset_gpio =fwnode_gpiod_get_index (&adev->fwnode,"reset" , cs35l41->index, + cs35l41->reset_gpio =fwnode_gpiod_get_index (acpi_fwnode_handle (adev),"reset" , cs35l41->index,GPIOD_OUT_LOW ,"cs35l41-reset" ); property ="cirrus,speaker-position" ;
Signature · 1 line
2.35.1
PATCH v2 2/4 ALSA: hda: cs35l41: Allow compilation test on non-ACPI configurations
ACPI is needed only for functioning of this codec on some platforms, there is no compilation dependency, so make it optional
---
v2: no changes
sound/pci/hda/Kconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
sound/pci/hda/Kconfig +2 -2
@@ -97,7 +97,7 @@ config SND_HDA_SCODEC_CS35L41 config SND_HDA_SCODEC_CS35L41_I2C tristate "Build CS35L41 HD-audio side codec support for I2C Bus" depends on I2C - depends on ACPI + depends on ACPI || COMPILE_TEST depends on SND_SOC select SND_HDA_GENERIC select SND_SOC_CS35L41_LIB
@@ -113,7 +113,7 @@ comment "Set to Y if you want auto-loading the side codec driver" config SND_HDA_SCODEC_CS35L41_SPI tristate "Build CS35L41 HD-audio codec support for SPI Bus" depends on SPI_MASTER - depends on ACPI + depends on ACPI || COMPILE_TEST depends on SND_SOC select SND_HDA_GENERIC select SND_SOC_CS35L41_LIB
Signature · 1 line
2.35.1
PATCH v2 3/4 ALSA: hda: cs35l41: Drop wrong use of ACPI_PTR()
In reply to Andy ShevchenkoACPI_PTR() is more harmful than helpful. For example, in this case if CONFIG_ACPI=n, the ID table left unused which is not what we want.
Instead of adding ifdeffery or attribute here and there, drop ACPI_PTR().
---
v2: no changes
sound/pci/hda/cs35l41_hda_i2c.c | 8 +++----- sound/pci/hda/cs35l41_hda_spi.c | 8 +++----- 2 files changed, 6 insertions(+), 10 deletions(-)
sound/pci/hda/cs35l41_hda_i2c.c +3 -5
@@ -6,9 +6,9 @@// // Author: Lucas Tanure <[email protected]> +#include <linux/mod_devicetable.h> #include <linux/module.h> #include <linux/i2c.h> -#include <linux/acpi.h> #include "cs35l41_hda.h"
@@ -43,19 +43,17 @@ static const struct i2c_device_id cs35l41_hda_i2c_id[] = { {} }; -#ifdef CONFIG_ACPI static const struct acpi_device_id cs35l41_acpi_hda_match[] = { {"CLSA0100" ,0 }, {"CSC3551" ,0 }, - { }, + {} };MODULE_DEVICE_TABLE (acpi, cs35l41_acpi_hda_match); -#endif static struct i2c_driver cs35l41_i2c_driver = { .driver = { .name ="cs35l41-hda" , - .acpi_match_table =ACPI_PTR (cs35l41_acpi_hda_match), + .acpi_match_table = cs35l41_acpi_hda_match, }, .id_table = cs35l41_hda_i2c_id, .probe = cs35l41_hda_i2c_probe,
sound/pci/hda/cs35l41_hda_spi.c +3 -5
@@ -6,7 +6,7 @@// // Author: Lucas Tanure <[email protected]> -#include <linux/acpi.h> +#include <linux/mod_devicetable.h> #include <linux/module.h> #include <linux/spi/spi.h>
@@ -39,18 +39,16 @@ static const struct spi_device_id cs35l41_hda_spi_id[] = { {} }; -#ifdef CONFIG_ACPI static const struct acpi_device_id cs35l41_acpi_hda_match[] = { {"CSC3551" ,0 }, - {}, + {} };MODULE_DEVICE_TABLE (acpi, cs35l41_acpi_hda_match); -#endif static struct spi_driver cs35l41_spi_driver = { .driver = { .name ="cs35l41-hda" , - .acpi_match_table =ACPI_PTR (cs35l41_acpi_hda_match), + .acpi_match_table = cs35l41_acpi_hda_match, }, .id_table = cs35l41_hda_spi_id, .probe = cs35l41_hda_spi_probe,
Signature · 1 line
2.35.1
PATCH v2 4/4 ALSA: hda: cs35l41: Consolidate selections under SND_HDA_SCODEC_CS35L41
In reply to Andy ShevchenkoSelections can be propagated via selections, while dependencies are not. Hence, consolidate selections under the SND_HDA_SCODEC_CS35L41 option.
---
v2: no changes
sound/pci/hda/Kconfig | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
sound/pci/hda/Kconfig +2 -4
@@ -93,16 +93,16 @@ config SND_HDA_PATCH_LOADER config SND_HDA_SCODEC_CS35L41 tristate + select SND_HDA_GENERIC + select REGMAP_IRQ config SND_HDA_SCODEC_CS35L41_I2C tristate "Build CS35L41 HD-audio side codec support for I2C Bus" depends on I2C depends on ACPI || COMPILE_TEST depends on SND_SOC - select SND_HDA_GENERIC select SND_SOC_CS35L41_LIB select SND_HDA_SCODEC_CS35L41 - select REGMAP_IRQ help Say Y or M here to include CS35L41 I2C HD-audio side codec support in snd-hda-intel driver, such as ALC287.
@@ -115,10 +115,8 @@ config SND_HDA_SCODEC_CS35L41_SPI depends on SPI_MASTER depends on ACPI || COMPILE_TEST depends on SND_SOC - select SND_HDA_GENERIC select SND_SOC_CS35L41_LIB select SND_HDA_SCODEC_CS35L41 - select REGMAP_IRQ help Say Y or M here to include CS35L41 SPI HD-audio side codec support in snd-hda-intel driver, such as ALC287.
Signature · 1 line
2.35.1
Takashi Iwai
AppliedQuoted 7 lines · Andy Shevchenko
Use
acpi_fwnode_handle()instead of dereferencing an fwnode handle directly, which is a better coding practice.Signed-off-by Andy Shevchenko <[email protected]>---
v2: new change
Thanks, applied all four patches now.
Takashi