Thread (9 messages) flat view 9 messages, 4 authors, 2014-06-12

Re: [PATCH 2/3 v4] spi: s3c64xx: for DT platofrms always get the chipselect info from DT node

From: Naveen Krishna Ch <hidden>
Date: 2014-06-12 16:09:06
Also in: linux-arm-kernel, linux-samsung-soc

Hello Javier,

On 12 June 2014 19:36, Javier Martinez Canillas
[off-list ref] wrote:
Hello Naveen,

On 06/12/2014 03:13 PM, Naveen Krishna Chatradhi wrote:
quoted
Use controller_data structure only for the Non Device tree  platforms.
For Device tree platforms, always derive the chipselect info from
DT node.

Signed-off-by: Naveen Krishna Chatradhi <redacted>
Cc: Javier Martinez Canillas <redacted>
Cc: Doug Anderson <dianders@chromium.org>
Cc: Tomasz Figa <redacted>
---
 drivers/spi/spi-s3c64xx.c |   11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/drivers/spi/spi-s3c64xx.c b/drivers/spi/spi-s3c64xx.c
index b888c66..f27e15d 100644
--- a/drivers/spi/spi-s3c64xx.c
+++ b/drivers/spi/spi-s3c64xx.c
@@ -795,14 +795,15 @@ static int s3c64xx_spi_setup(struct spi_device *spi)
      int err;

      sdd = spi_master_get_devdata(spi->master);
-     if (!cs && spi->dev.of_node) {
+     if (spi->dev.of_node) {
              cs = s3c64xx_get_slave_ctrldata(spi);
              spi->controller_data = cs;
-     }
-
-     /* For the non-DT platforms derive chip selects from controller data */
-     if (!spi->dev.of_node)
+     } else {
+             /* For the non-DT platforms derive chip
+              * selects from controller data
+              */
              spi->cs_gpio = cs->line;
+     }

      if (IS_ERR_OR_NULL(cs)) {
              dev_err(&spi->dev, "No CS for SPI(%d)\n", spi->chip_select);
Personally I wouldn't have this change as a separate patch since it's too
related to what you changed in Patch 1. But it's just a nitpick.
Patch 1/3 seems to be crowded with multiple changes.
Thought, this would keep the changes cleaner.
Reviewed-by: Javier Martinez Canillas <redacted>
Thanks
Best regards,
Javier


-- 
Shine bright,
(: Nav :)
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help