diff options
| author | Mark Brown <broonie@kernel.org> | 2024-08-19 19:58:04 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2024-08-19 19:58:04 +0100 |
| commit | 175fcd15e8606f2cca1edce43e18fa65c443bce6 (patch) | |
| tree | 76b3b8f11018da887195e88f151919a859f7f192 /sound/hda | |
| parent | 46e211411113932be1fd31580a03502466648f91 (diff) | |
| parent | 1f3662838a05f1ab6af89a417f6f252d91d0806b (diff) | |
ALSA/ASoC/SoundWire: Intel: update maximum number
Merge series from Bard Liao <yung-chuan.liao@linux.intel.com>:
Intel new platforms can have up to 5 SoundWire links.
This series does not apply to SoundWire tree due to recent changes in
machine driver. Can we go via ASoC tree with Vinod's Acked-by tag?
Diffstat (limited to 'sound/hda')
| -rw-r--r-- | sound/hda/intel-sdw-acpi.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sound/hda/intel-sdw-acpi.c b/sound/hda/intel-sdw-acpi.c index f3b2a610df23..04d6b6beabca 100644 --- a/sound/hda/intel-sdw-acpi.c +++ b/sound/hda/intel-sdw-acpi.c @@ -17,7 +17,6 @@ #include <linux/string.h> #define SDW_LINK_TYPE 4 /* from Intel ACPI documentation */ -#define SDW_MAX_LINKS 4 static int ctrl_link_mask; module_param_named(sdw_link_mask, ctrl_link_mask, int, 0444); @@ -87,9 +86,9 @@ sdw_intel_scan_controller(struct sdw_intel_acpi_info *info) } /* Check count is within bounds */ - if (count > SDW_MAX_LINKS) { + if (count > SDW_INTEL_MAX_LINKS) { dev_err(&adev->dev, "Link count %d exceeds max %d\n", - count, SDW_MAX_LINKS); + count, SDW_INTEL_MAX_LINKS); return -EINVAL; } |