Commit 64299936 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Takashi Iwai
Browse files

ALSA: hda: cs35l41: Fix comments wrt serial-multi-instantiate reference 



The comments are inconsistent and point to the wrong driver name.
The initially named i2c-multi-instantiate it was renamed to the
serial-multi-instantiate exactly due to support of the platforms
with multiple CS35L41 codecs.

Fix comments accordingly.

While at it, drop file names from the files.

Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20220711100129.37326-1-andriy.shevchenko@linux.intel.com


Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 04407412

sound/pci/hda/cs35l41_hda.c

+2 −2
Original line number Diff line number Diff line
@@ -415,8 +415,8 @@ static int cs35l41_hda_read_acpi(struct cs35l41_hda *cs35l41, const char *hid, i 
no_acpi_dsd:

	/*

	 * Device CLSA0100 doesn't have _DSD so a gpiod_get by the label reset won't work.

	 * And devices created by i2c-multi-instantiate don't have their device struct pointing to

	 * the correct fwnode, so acpi_dev must be used here.

	 * And devices created by serial-multi-instantiate don't have their device struct

	 * pointing to the correct fwnode, so acpi_dev must be used here.

	 * And devm functions expect that the device requesting the resource has the correct

	 * fwnode.

	 */

sound/pci/hda/cs35l41_hda_i2c.c

+4 −3
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

//

// cs35l41.c -- CS35l41 HDA I2C driver

// CS35l41 HDA I2C driver

//

// Copyright 2021 Cirrus Logic, Inc.

//
@@ -16,8 +16,9 @@ static int cs35l41_hda_i2c_probe(struct i2c_client *clt, const struct i2c_device 
{

	const char *device_name;



	/* Compare against the device name so it works for I2C, normal ACPI

	 * and for ACPI by i2c-multi-instantiate matching cases

	/*

	 * Compare against the device name so it works for SPI, normal ACPI

	 * and for ACPI by serial-multi-instantiate matching cases.

	 */

	if (strstr(dev_name(&clt->dev), "CLSA0100"))

		device_name = "CLSA0100";

sound/pci/hda/cs35l41_hda_spi.c

+4 −3
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

//

// cs35l41.c -- CS35l41 HDA SPI driver

// CS35l41 HDA SPI driver

//

// Copyright 2021 Cirrus Logic, Inc.

//
@@ -16,8 +16,9 @@ static int cs35l41_hda_spi_probe(struct spi_device *spi) 
{

	const char *device_name;



	/* Compare against the device name so it works for SPI, normal ACPI

	 * and for ACPI by spi-multi-instantiate matching cases

	/*

	 * Compare against the device name so it works for SPI, normal ACPI

	 * and for ACPI by serial-multi-instantiate matching cases.

	 */

	if (strstr(dev_name(&spi->dev), "CSC3551"))

		device_name = "CSC3551";