From cc03b0925fd73d3a2f60dfc241f3232bb949b4e5 Mon Sep 17 00:00:00 2001 From: Thomas McKahan Date: Tue, 22 Jan 2019 23:54:14 -0500 Subject: [PATCH] [ meson64-dev ] update spidev warning patch --- .../meson64_remove_spidev_warning.patch | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/patch/kernel/meson64-dev/meson64_remove_spidev_warning.patch b/patch/kernel/meson64-dev/meson64_remove_spidev_warning.patch index 8dd0da073..924250c97 100644 --- a/patch/kernel/meson64-dev/meson64_remove_spidev_warning.patch +++ b/patch/kernel/meson64-dev/meson64_remove_spidev_warning.patch @@ -1,18 +1,17 @@ diff --git a/drivers/spi/spidev.c b/drivers/spi/spidev.c -index cda10719d..412adcba5 100644 +index b0c76e262..f8f91353f 100644 --- a/drivers/spi/spidev.c +++ b/drivers/spi/spidev.c -@@ -725,11 +725,9 @@ static int spidev_probe(struct spi_device *spi) +@@ -725,9 +725,9 @@ static int spidev_probe(struct spi_device *spi) + * compatible string, it is a Linux implementation thing * rather than a description of the hardware. */ - if (spi->dev.of_node && !of_match_device(spidev_dt_ids, &spi->dev)) { -- dev_err(&spi->dev, "buggy DT: spidev listed directly in DT\n"); -- WARN_ON(spi->dev.of_node && -- !of_match_device(spidev_dt_ids, &spi->dev)); +- 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_match_device(spidev_dt_ids, &spi->dev)) { + dev_info(&spi->dev, "probing from DT"); - } -- -+ ++ } + spidev_probe_acpi(spi); - /* Allocate driver data */