Unverified Commit 2cd24c31 authored by Pierre-Louis Bossart's avatar Pierre-Louis Bossart Committed by Mark Brown
Browse files

soundwire: intel_init: remove check on number of links 



The number of links is checked with a chip-dependent helper in the
caller, remove the check in drivers/soundwire/intel_init.c

This change makes intel_init.c hardware-agnostic - which is quite
fitting for a layer that only creates auxiliary devices.

Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: default avatarPéter Ujfalusi <peter.ujfalusi@linux.intel.com>
Reviewed-by: default avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Signed-off-by: default avatarBard Liao <yung-chuan.liao@linux.intel.com>
Acked-By: default avatarVinod Koul <vkoul@kernel.org>
Link: https://lore.kernel.org/r/20221111042653.45520-8-yung-chuan.liao@linux.intel.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 562bb228

drivers/soundwire/intel_init.c

+0 −12
Original line number Diff line number Diff line
@@ -272,24 +272,12 @@ sdw_intel_startup_controller(struct sdw_intel_ctx *ctx) 
{

	struct acpi_device *adev = acpi_fetch_acpi_dev(ctx->handle);

	struct sdw_intel_link_dev *ldev;

	u32 caps;

	u32 link_mask;

	int i;



	if (!adev)

		return -EINVAL;



	/* Check SNDWLCAP.LCOUNT */

	caps = ioread32(ctx->mmio_base + ctx->shim_base + SDW_SHIM_LCAP);

	caps &= SDW_SHIM_LCAP_LCOUNT_MASK;



	/* Check HW supported vs property value */

	if (caps < ctx->count) {

		dev_err(&adev->dev,

			"BIOS master count is larger than hardware capabilities\n");

		return -EINVAL;

	}



	if (!ctx->ldev)

		return -EINVAL;