From: anilkumar@ti.com (AnilKumar Ch)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2 2/4] lis3: lis3lv02d_spi: Add lis3lv02d device tree init
Date: Fri, 14 Sep 2012 13:36:54 +0530 [thread overview]
Message-ID: <1347610016-10123-3-git-send-email-anilkumar@ti.com> (raw)
In-Reply-To: <1347610016-10123-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
next prev parent reply other threads:[~2012-09-14 8:06 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-14 8:06 [PATCH v2 0/4] lis3: lis3lv02d_i2c: Add device tree support AnilKumar Ch
2012-09-14 8:06 ` [PATCH v2 1/4] lis3: lis3lv02d: remove lis3lv02d driver DT init AnilKumar Ch
2012-09-14 8:06 ` AnilKumar Ch [this message]
2012-09-14 8:06 ` [PATCH v2 3/4] lis3: lis3lv02d_i2c: Add lis3lv02d device tree init AnilKumar Ch
2012-09-14 8:06 ` [PATCH v2 4/4] ARM: dts: AM33XX: Add lis331dlh device tree data to am335x-evm AnilKumar Ch
2012-09-14 15:31 ` [PATCH v2 0/4] lis3: lis3lv02d_i2c: Add device tree support Arnd Bergmann
2012-09-14 19:51 ` Andrew Morton
2012-09-14 20:01 ` Arnd Bergmann
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=1347610016-10123-3-git-send-email-anilkumar@ti.com \
--to=anilkumar@ti.com \
--cc=linux-arm-kernel@lists.infradead.org \
/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).