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: Andy Shevchenko <andy.shevchenko@gmail.com>
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Link: https://lore.kernel.org/r/20240416100904.3738093-3-ckeepax@opensource.cirrus.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
index ff75838c1b5dfa44fccca525c3a8a334051167fb..26f287d8d9463367ce9944eadf8e648250dcc771 100644 (file)
--- a/drivers/spi/spi.c
+++ b/drivers/spi/spi.c
@@ -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;
        }