Skip to content

Commit

Permalink
ALSA: hda: cs35l41: Fix comments wrt serial-multi-instantiate reference
Browse files Browse the repository at this point in the history
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: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20220711100129.37326-1-andriy.shevchenko@linux.intel.com
Signed-off-by: Takashi Iwai <tiwai@suse.de>
  • Loading branch information
Andy Shevchenko authored and Takashi Iwai committed Jul 12, 2022
1 parent 0440741 commit 6429993
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 8 deletions.
4 changes: 2 additions & 2 deletions sound/pci/hda/cs35l41_hda.c
Original file line number Diff line number Diff line change
Expand Up @@ -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.
*/
Expand Down
7 changes: 4 additions & 3 deletions sound/pci/hda/cs35l41_hda_i2c.c
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-2.0
//
// cs35l41.c -- CS35l41 HDA I2C driver
// CS35l41 HDA I2C driver
//
// Copyright 2021 Cirrus Logic, Inc.
//
Expand All @@ -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";
Expand Down
7 changes: 4 additions & 3 deletions sound/pci/hda/cs35l41_hda_spi.c
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-2.0
//
// cs35l41.c -- CS35l41 HDA SPI driver
// CS35l41 HDA SPI driver
//
// Copyright 2021 Cirrus Logic, Inc.
//
Expand All @@ -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";
Expand Down

0 comments on commit 6429993

Please sign in to comment.