| Message ID | 20181115103209.20619-1-lkundrak@v3.sk (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | f0915dfc44365b487a720d447ad3faa66de5205c |
| Headers | show |
| Series | [v2] spi: pxa2xx: Fix '"CONFIG_OF" is not defined' warning | expand |
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;
A careless oversight. Sorry. Fixes: 0a897143b7c9 ("spi: pxa2xx: Add slave mode support") Signed-off-by: Lubomir Rintel <lkundrak@v3.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(-)