devicetree.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: AnilKumar Ch <anilkumar@ti.com>
To: arnd@arndb.de
Cc: gregkh@linuxfoundation.org, eric.piel@tremplin-utc.net,
	jic23@cam.ac.uk, greg@kroah.com, akpm@linux-foundation.org,
	broonie@opensource.wolfsonmicro.com, dmitry.torokhov@gmail.com,
	tony@atomide.com, linux-omap@vger.kernel.org,
	linux-arm-kernel@lists.infradead.org,
	devicetree-discuss@lists.ozlabs.org, grant.likely@secretlab.ca,
	AnilKumar Ch <anilkumar@ti.com>
Subject: [PATCH v3 2/4] lis3: lis3lv02d_spi: Add lis3lv02d device tree init
Date: Mon, 17 Sep 2012 12:53:20 +0530	[thread overview]
Message-ID: <1347866602-2088-3-git-send-email-anilkumar@ti.com> (raw)
In-Reply-To: <1347866602-2088-1-git-send-email-anilkumar@ti.com>

Add lis3lv02d device tree initialization code/API to take pdata
from device node. Also remove CONFIG_OF ifdef from the driver,
if CONFIG_OF is not defined then OF APIs returns 0.

Signed-off-by: AnilKumar Ch <anilkumar@ti.com>
---
 drivers/misc/lis3lv02d/lis3lv02d_spi.c |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/drivers/misc/lis3lv02d/lis3lv02d_spi.c b/drivers/misc/lis3lv02d/lis3lv02d_spi.c
index 23f3986..e1db6f4 100644
--- a/drivers/misc/lis3lv02d/lis3lv02d_spi.c
+++ b/drivers/misc/lis3lv02d/lis3lv02d_spi.c
@@ -84,10 +84,12 @@ static int __devinit lis302dl_spi_probe(struct spi_device *spi)
 	lis3_dev.ac		= lis3lv02d_axis_normal;
 	lis3_dev.pdata		= spi->dev.platform_data;
 
-#ifdef CONFIG_OF
-	if (of_match_device(lis302dl_spi_dt_ids, &spi->dev))
+	if (of_match_device(lis302dl_spi_dt_ids, &spi->dev)) {
 		lis3_dev.of_node = spi->dev.of_node;
-#endif
+		ret = lis3lv02d_init_dt(&lis3_dev);
+		if (ret)
+			return ret;
+	}
 
 	spi_set_drvdata(spi, &lis3_dev);
 
-- 
1.7.9.5


  parent reply	other threads:[~2012-09-17  7:23 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-09-17  7:23 [PATCH v3 0/4] lis3: lis3lv02d_i2c: Add device tree support AnilKumar Ch
2012-09-17  7:23 ` [PATCH v3 1/4] lis3: lis3lv02d: remove lis3lv02d driver DT init AnilKumar Ch
2012-09-17  7:23 ` AnilKumar Ch [this message]
2012-09-17  7:23 ` [PATCH v3 3/4] lis3: lis3lv02d_i2c: Add lis3lv02d device tree init AnilKumar Ch
2012-09-17  7:23 ` [PATCH v3 4/4] ARM: dts: AM33XX: Add lis331dlh device tree data to am335x-evm AnilKumar Ch
2012-09-17 22:35   ` Andrew Morton
     [not found]     ` <20120917153559.e07ca263.akpm-de/tnXTf+JLsfHDXvbKv3WD2FQJk+8+b@public.gmane.org>
2012-09-18  7:35       ` AnilKumar, Chimata
2012-09-17 11:51 ` [PATCH v3 0/4] lis3: lis3lv02d_i2c: Add device tree support Arnd Bergmann
2012-09-26 20:24 ` Greg KH
2012-09-26 20:34   ` Andrew Morton
2012-09-26 20:44     ` Greg KH
2012-09-26 20:54       ` Andrew Morton
2012-09-26 20:57         ` Greg KH

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1347866602-2088-3-git-send-email-anilkumar@ti.com \
    --to=anilkumar@ti.com \
    --cc=akpm@linux-foundation.org \
    --cc=arnd@arndb.de \
    --cc=broonie@opensource.wolfsonmicro.com \
    --cc=devicetree-discuss@lists.ozlabs.org \
    --cc=dmitry.torokhov@gmail.com \
    --cc=eric.piel@tremplin-utc.net \
    --cc=grant.likely@secretlab.ca \
    --cc=greg@kroah.com \
    --cc=gregkh@linuxfoundation.org \
    --cc=jic23@cam.ac.uk \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-omap@vger.kernel.org \
    --cc=tony@atomide.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).