| From 3b0944d8f563cdb3a7f7766d112f3cd7ab0aa2f1 Mon Sep 17 00:00:00 2001 |
| From: Michal Simek <michal.simek@xilinx.com> |
| Date: Mon, 8 Jul 2013 15:29:17 +0200 |
| Subject: spi/xilinx: Use of_property_read_u32 for reading value from node |
| |
| It simplifies driver probing. |
| |
| Signed-off-by: Michal Simek <michal.simek@xilinx.com> |
| Signed-off-by: Mark Brown <broonie@linaro.org> |
| (cherry picked from commit be3acdff943f46c32e9b2f453f0033bbae01a804) |
| Signed-off-by: Daniel Sangorrin <daniel.sangorrin@toshiba.co.jp> |
| Signed-off-by: Yoshitake Kobayashi <yoshitake.kobayashi@toshiba.co.jp> |
| --- |
| drivers/spi/spi-xilinx.c | 14 +++----------- |
| 1 file changed, 3 insertions(+), 11 deletions(-) |
| |
| diff --git a/drivers/spi/spi-xilinx.c b/drivers/spi/spi-xilinx.c |
| index c3ea6cad568f..1c3372084bc8 100644 |
| --- a/drivers/spi/spi-xilinx.c |
| +++ b/drivers/spi/spi-xilinx.c |
| @@ -368,17 +368,9 @@ static int xilinx_spi_probe(struct platform_device *pdev) |
| if (pdata) { |
| num_cs = pdata->num_chipselect; |
| bits_per_word = pdata->bits_per_word; |
| - } |
| - |
| - if (pdev->dev.of_node) { |
| - const __be32 *prop; |
| - int len; |
| - |
| - /* number of slave select bits is required */ |
| - prop = of_get_property(pdev->dev.of_node, "xlnx,num-ss-bits", |
| - &len); |
| - if (prop && len >= sizeof(*prop)) |
| - num_cs = __be32_to_cpup(prop); |
| + } else { |
| + of_property_read_u32(pdev->dev.of_node, "xlnx,num-ss-bits", |
| + &num_cs); |
| } |
| |
| if (!num_cs) { |
| -- |
| 1.8.5.rc3 |
| |
