dt/s3c64xx/spi: Use of_get_child_by_name to get a named child
authorSrinivas Kandagatla <srinivas.kandagatla@st.com>
Tue, 18 Sep 2012 07:10:49 +0000 (08:10 +0100)
committerRob Herring <rob.herring@calxeda.com>
Mon, 1 Oct 2012 15:50:26 +0000 (10:50 -0500)
As follow-up to "dt: introduce of_get_child_by_name to get child node by
name." patch, This patch removes some of the code duplication in the
driver by replacing it with of_get_child_by_name instead.

Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@st.com>
Signed-off-by: Rob Herring <rob.herring@calxeda.com>
drivers/spi/spi-s3c64xx.c

index 646a7657fe62fbb545f95fc771b406d0cad6e5f9..12b8c9c608edea3def2c4d62dff1b181e671d277 100644 (file)
@@ -835,9 +835,7 @@ static struct s3c64xx_spi_csinfo *s3c64xx_get_slave_ctrldata(
                return ERR_PTR(-EINVAL);
        }
 
-       for_each_child_of_node(slave_np, data_np)
-               if (!strcmp(data_np->name, "controller-data"))
-                       break;
+       data_np = of_get_child_by_name(slave_np, "controller-data");
        if (!data_np) {
                dev_err(&spi->dev, "child node 'controller-data' not found\n");
                return ERR_PTR(-EINVAL);
@@ -847,6 +845,7 @@ static struct s3c64xx_spi_csinfo *s3c64xx_get_slave_ctrldata(
        if (!cs) {
                dev_err(&spi->dev, "could not allocate memory for controller"
                                        " data\n");
+               of_node_put(data_np);
                return ERR_PTR(-ENOMEM);
        }
 
@@ -855,11 +854,13 @@ static struct s3c64xx_spi_csinfo *s3c64xx_get_slave_ctrldata(
                dev_err(&spi->dev, "chip select gpio is not specified or "
                                        "invalid\n");
                kfree(cs);
+               of_node_put(data_np);
                return ERR_PTR(-EINVAL);
        }
 
        of_property_read_u32(data_np, "samsung,spi-feedback-delay", &fb_delay);
        cs->fb_delay = fb_delay;
+       of_node_put(data_np);
        return cs;
 }