spi: Use stable dev_name for ACPI enumerated SPI slaves (e13ac47b) · Commits · 戴 / test

Current spi bus_num.chip_select "spix.y" based device naming scheme may not be stable enough to be used in name based matching, for instance within ALSA SoC subsystem. This can be problem in PC kind of platforms if there are changes in SPI bus configuration, amount of busses or probe order. This patch addresses the problem by using the ACPI device name with "spi-" prefix for ACPI enumerated SPI slave. For them device name "spix.y" becomes "spi-INTABCD:ij". Signed-off-by:

Jarkko Nikula <jarkko.nikula@linux.intel.com> Acked-by:

Mark Brown <broonie@linaro.org> Signed-off-by:

Rafael J. Wysocki <rafael.j.wysocki@intel.com>

drivers/spi/spi.c

+14 −3

Original line number	Diff line number	Diff line
		@@ -357,6 +357,19 @@ struct spi_device spi_alloc_device(struct spi_master master)
		}
		EXPORT_SYMBOL_GPL(spi_alloc_device);

		static void spi_dev_set_name(struct spi_device *spi)
		{
		struct acpi_device *adev = ACPI_COMPANION(&spi->dev);

		if (adev) {
		dev_set_name(&spi->dev, "spi-%s", acpi_dev_name(adev));
		return;
		}

		dev_set_name(&spi->dev, "%s.%u", dev_name(&spi->master->dev),
		spi->chip_select);
		}

		/**
		* spi_add_device - Add spi_device allocated with spi_alloc_device
		* @spi: spi_device to register
		@@ -383,9 +396,7 @@ int spi_add_device(struct spi_device *spi)
		}

		/* Set the bus ID string */
		dev_set_name(&spi->dev, "%s.%u", dev_name(&spi->master->dev),
		spi->chip_select);

		spi_dev_set_name(spi);

		/* We need to make sure there's no other device with this
		* chipselect BEFORE we call setup(), else we'll trash

Admin message