diff mbox series

[v1] ASoC: cs35l41: Fix acpi_device_hid() not found

Message ID 20250210163256.1722350-1-sbinding@opensource.cirrus.com (mailing list archive)
State Accepted
Commit b19181638182d1f5c43757b471c056b6196c8ca3
Headers show
Series [v1] ASoC: cs35l41: Fix acpi_device_hid() not found | expand

Commit Message

Stefan Binding Feb. 10, 2025, 4:32 p.m. UTC
Function acpi_device_hid() is only defined if CONFIG_ACPI is set.
Use #ifdef CONFIG_ACPI to ensure that cs35l41 driver only calls this
function is CONFIG_ACPI is define.

Fixes: 1d44a30ae3f9 ("ASoC: cs35l41: Fallback to using HID for system_name if no SUB is available")
Reported-by: kernel test robot <lkp@intel.com>
Closes: https://lore.kernel.org/oe-kbuild-all/202502090100.SbXmGFqs-lkp@intel.com/

Signed-off-by: Stefan Binding <sbinding@opensource.cirrus.com>
---
 sound/soc/codecs/cs35l41.c | 7 +++++++
 1 file changed, 7 insertions(+)

Comments

André Almeida Feb. 10, 2025, 4:54 p.m. UTC | #1
On 2/10/25 17:32, Stefan Binding wrote:
> Function acpi_device_hid() is only defined if CONFIG_ACPI is set.
> Use #ifdef CONFIG_ACPI to ensure that cs35l41 driver only calls this
> function is CONFIG_ACPI is define.
>
> Fixes: 1d44a30ae3f9 ("ASoC: cs35l41: Fallback to using HID for system_name if no SUB is available")
> Reported-by: kernel test robot <lkp@intel.com>
> Closes: https://lore.kernel.org/oe-kbuild-all/202502090100.SbXmGFqs-lkp@intel.com/
>
> Signed-off-by: Stefan Binding <sbinding@opensource.cirrus.com>
>
Reviewed-by: André Almeida <andrealmeid@igalia.com>
Mark Brown Feb. 10, 2025, 6:28 p.m. UTC | #2
On Mon, 10 Feb 2025 16:32:50 +0000, Stefan Binding wrote:
> Function acpi_device_hid() is only defined if CONFIG_ACPI is set.
> Use #ifdef CONFIG_ACPI to ensure that cs35l41 driver only calls this
> function is CONFIG_ACPI is define.
> 
> Fixes: 1d44a30ae3f9 ("ASoC: cs35l41: Fallback to using HID for system_name if no SUB is available")
> Reported-by: kernel test robot <lkp@intel.com>
> Closes: https://lore.kernel.org/oe-kbuild-all/202502090100.SbXmGFqs-lkp@intel.com/
> 
> [...]

Applied to

   https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next

Thanks!

[1/1] ASoC: cs35l41: Fix acpi_device_hid() not found
      commit: b19181638182d1f5c43757b471c056b6196c8ca3

All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying
to this mail.

Thanks,
Mark
diff mbox series

Patch

diff --git a/sound/soc/codecs/cs35l41.c b/sound/soc/codecs/cs35l41.c
index 30b89018b113..ff4134bee858 100644
--- a/sound/soc/codecs/cs35l41.c
+++ b/sound/soc/codecs/cs35l41.c
@@ -1148,6 +1148,7 @@  static int cs35l41_dsp_init(struct cs35l41_private *cs35l41)
 	return ret;
 }
 
+#ifdef CONFIG_ACPI
 static int cs35l41_acpi_get_name(struct cs35l41_private *cs35l41)
 {
 	struct acpi_device *adev = ACPI_COMPANION(cs35l41->dev);
@@ -1180,6 +1181,12 @@  static int cs35l41_acpi_get_name(struct cs35l41_private *cs35l41)
 
 	return 0;
 }
+#else
+static int cs35l41_acpi_get_name(struct cs35l41_private *cs35l41)
+{
+	return 0;
+}
+#endif /* CONFIG_ACPI */
 
 int cs35l41_probe(struct cs35l41_private *cs35l41, const struct cs35l41_hw_cfg *hw_cfg)
 {