Unverified Commit 8a101146 authored by Charles Keepax's avatar Charles Keepax Committed by Mark Brown
Browse files

spi: Switch to using is_acpi_device_node() in spi_dev_set_name() 



Use is_acpi_device_node() rather than checking ACPI_COMPANION(), such
that when checking for other types of firmware node, the code can
consistently do checks against the fwnode.

Suggested-by: default avatarAndy Shevchenko <andy.shevchenko@gmail.com>
Reviewed-by: default avatarAndy Shevchenko <andy.shevchenko@gmail.com>
Signed-off-by: default avatarCharles Keepax <ckeepax@opensource.cirrus.com>
Link: https://lore.kernel.org/r/20240416100904.3738093-3-ckeepax@opensource.cirrus.com


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

drivers/spi/spi.c

+4 −3
Original line number Diff line number Diff line
@@ -597,10 +597,11 @@ EXPORT_SYMBOL_GPL(spi_alloc_device); 


static void spi_dev_set_name(struct spi_device *spi)

{

	struct acpi_device *adev = ACPI_COMPANION(&spi->dev);

	struct device *dev = &spi->dev;

	struct fwnode_handle *fwnode = dev_fwnode(dev);



	if (adev) {

		dev_set_name(&spi->dev, "spi-%s", acpi_dev_name(adev));

	if (is_acpi_device_node(fwnode)) {

		dev_set_name(dev, "spi-%s", acpi_dev_name(to_acpi_device_node(fwnode)));

		return;

	}