spi: spidev: Make probe to fail early if a spidev compatible is used

Some Device Trees don't use a real device name in the compatible string
for SPI devices nodes, abusing the fact that the spidev driver name is
used to match as a fallback when a SPI device ID table is not defined.

But since commit 6840615f85f6 ("spi: spidev: Add SPI ID table") a table
for SPI device IDs was added to the driver breaking the assumption that
these DTs were relying on.

There has been a warning message for some time since commit 956b200a846e
("spi: spidev: Warn loudly if instantiated from DT as "spidev""), making
quite clear that this case is not really supported by the spidev driver.

Since these devices won't match anyways after the mentioned commit, there
is no point to continue if an spidev compatible is used. Let's just make
the driver probe to fail early.

Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
Link: https://lore.kernel.org/r/20211109225920.1158920-1-javierm@redhat.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/drivers/spi/spidev.c b/drivers/spi/spidev.c
index 968dab2f5e3de96922240a3e197a40838d7b4b98..a5cceca8b82b6c61891346fbeeee41cb5474df3c 100644 (file)
--- a/drivers/spi/spidev.c
+++ b/drivers/spi/spidev.c
@@ -751,9 +751,10 @@ static int spidev_probe(struct spi_device *spi)
         * compatible string, it is a Linux implementation thing
         * rather than a description of the hardware.
         */
-       WARN(spi->dev.of_node &&
-            of_device_is_compatible(spi->dev.of_node, "spidev"),
-            "%pOF: buggy DT: spidev listed directly in DT\n", spi->dev.of_node);
+       if (spi->dev.of_node && of_device_is_compatible(spi->dev.of_node, "spidev")) {
+               dev_err(&spi->dev, "spidev listed directly in DT is not supported\n");
+               return -EINVAL;
+       }
 
        spidev_probe_acpi(spi);