From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752080AbcF0TCl (ORCPT ); Mon, 27 Jun 2016 15:02:41 -0400 Received: from mail-wm0-f66.google.com ([74.125.82.66]:35289 "EHLO mail-wm0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751951AbcF0TCj (ORCPT ); Mon, 27 Jun 2016 15:02:39 -0400 From: Michal Suchanek To: Greg Kroah-Hartman , Mark Brown , linux-kernel@vger.kernel.org, linux-spi@vger.kernel.org Cc: Michal Suchanek Subject: [PATCH v2 1/3] spi: spidev: fix the check for spidev in dt Date: Mon, 27 Jun 2016 21:02:30 +0200 Message-Id: <0123f28025f0a29a0771a43397ad14259a2094b7.1467053363.git.hramrach@gmail.com> X-Mailer: git-send-email 2.8.1 In-Reply-To: References: In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The error message is "buggy DT: spidev listed directly in DT\n" That's not what the check does. It checks that one if the IDs listed in the driver match table matches what is set on the DT node. This does not work if you manage to convince the kernel to bind spidev on a node that has some other random compatible which is not "spidev". Also the spidev id match table is not compiled when !CONFIG_OF So add a match table that has just "spidev" entry in it so it can reliably detect what this message is supposed to warn about. Signed-off-by: Michal Suchanek --- - fix indent - update commit mesage --- drivers/spi/spidev.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/drivers/spi/spidev.c b/drivers/spi/spidev.c index e3c19f3..3c6ebe7 100644 --- a/drivers/spi/spidev.c +++ b/drivers/spi/spidev.c @@ -700,6 +700,11 @@ static const struct of_device_id spidev_dt_ids[] = { MODULE_DEVICE_TABLE(of, spidev_dt_ids); #endif +static const struct of_device_id spidev_check[] = { + { .compatible = "spidev" }, + {} +}; + /*-------------------------------------------------------------------------*/ static int spidev_probe(struct spi_device *spi) @@ -713,10 +718,10 @@ 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)) { + if (spi->dev.of_node && of_match_device(spidev_check, &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)); + of_match_device(spidev_check, &spi->dev)); } /* Allocate driver data */ -- 2.8.1