[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <20181115103209.20619-1-lkundrak@v3.sk>
Date: Thu, 15 Nov 2018 11:32:09 +0100
From: Lubomir Rintel <lkundrak@...sk>
To: Daniel Mack <daniel@...que.org>,
Haojian Zhuang <haojian.zhuang@...il.com>,
Robert Jarzmik <robert.jarzmik@...e.fr>
Cc: Mark Brown <broonie@...nel.org>, linux-spi@...r.kernel.org,
linux-kernel@...r.kernel.org, Lubomir Rintel <lkundrak@...sk>
Subject: [PATCH v2] spi: pxa2xx: Fix '"CONFIG_OF" is not defined' warning
A careless oversight. Sorry.
Fixes: 0a897143b7c9 ("spi: pxa2xx: Add slave mode support")
Signed-off-by: Lubomir Rintel <lkundrak@...sk>
---
Changes since v1:
- Applied Robert Jarzmik's wise suggestion to remove useless
conditionals and thus reduce this into a single line.
drivers/spi/spi-pxa2xx.c | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/drivers/spi/spi-pxa2xx.c b/drivers/spi/spi-pxa2xx.c
index 29e6025f104c..4f55c9647289 100644
--- a/drivers/spi/spi-pxa2xx.c
+++ b/drivers/spi/spi-pxa2xx.c
@@ -1555,19 +1555,13 @@ pxa2xx_spi_init_pdata(struct platform_device *pdev)
}
#endif
-#if CONFIG_OF
- if (of_id) {
- pdata->is_slave = of_property_read_bool(pdev->dev.of_node,
- "spi-slave");
- }
-#endif
-
ssp->clk = devm_clk_get(&pdev->dev, NULL);
ssp->irq = platform_get_irq(pdev, 0);
ssp->type = type;
ssp->pdev = pdev;
ssp->port_id = pxa2xx_spi_get_port_id(adev);
+ pdata->is_slave = of_property_read_bool(pdev->dev.of_node, "spi-slave");
pdata->num_chipselect = 1;
pdata->enable_dma = true;
--
2.19.1
Powered by blists - more mailing lists