All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH 1/2] backlight/lp855x: Refactor dt parsing code
@ 2014-11-26 19:11 ` Sean Paul
  0 siblings, 0 replies; 22+ messages in thread
From: Sean Paul @ 2014-11-26 19:11 UTC (permalink / raw)
  To: linux-fbdev-u79uwXL29TY76Z2rM5mHXA,
	devicetree-u79uwXL29TY76Z2rM5mHXA, milo.kim-l0cyMroinI0
  Cc: seanpaul-F7+t8E8rja9g9hUCZPvPmw, Stéphane Marchesin

This patch refactors the dt parsing code to avoid setting platform_data,
instead just setting lp->pdata directly. This facilitates easier
probe deferral since the current scheme would require us to clear out
dev->platform_data before deferring.

Cc: Stéphane Marchesin <marcheu-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org>
Signed-off-by: Sean Paul <seanpaul-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org>
---
 drivers/video/backlight/lp855x_bl.c | 37 ++++++++++++++++++-------------------
 1 file changed, 18 insertions(+), 19 deletions(-)

diff --git a/drivers/video/backlight/lp855x_bl.c b/drivers/video/backlight/lp855x_bl.c
index 25fb8e3..257b3ba 100644
--- a/drivers/video/backlight/lp855x_bl.c
+++ b/drivers/video/backlight/lp855x_bl.c
@@ -341,8 +341,10 @@ static const struct attribute_group lp855x_attr_group = {
 };
 
 #ifdef CONFIG_OF
-static int lp855x_parse_dt(struct device *dev, struct device_node *node)
+static int lp855x_parse_dt(struct lp855x *lp)
 {
+	struct device *dev = lp->dev;
+	struct device_node *node = dev->of_node;
 	struct lp855x_platform_data *pdata;
 	int rom_length;
 
@@ -381,12 +383,12 @@ static int lp855x_parse_dt(struct device *dev, struct device_node *node)
 		pdata->rom_data = &rom[0];
 	}
 
-	dev->platform_data = pdata;
+	lp->pdata = pdata;
 
 	return 0;
 }
 #else
-static int lp855x_parse_dt(struct device *dev, struct device_node *node)
+static int lp855x_parse_dt(struct lp855x *lp)
 {
 	return -EINVAL;
 }
@@ -395,18 +397,8 @@ static int lp855x_parse_dt(struct device *dev, struct device_node *node)
 static int lp855x_probe(struct i2c_client *cl, const struct i2c_device_id *id)
 {
 	struct lp855x *lp;
-	struct lp855x_platform_data *pdata = dev_get_platdata(&cl->dev);
-	struct device_node *node = cl->dev.of_node;
 	int ret;
 
-	if (!pdata) {
-		ret = lp855x_parse_dt(&cl->dev, node);
-		if (ret < 0)
-			return ret;
-
-		pdata = dev_get_platdata(&cl->dev);
-	}
-
 	if (!i2c_check_functionality(cl->adapter, I2C_FUNC_SMBUS_I2C_BLOCK))
 		return -EIO;
 
@@ -414,16 +406,23 @@ static int lp855x_probe(struct i2c_client *cl, const struct i2c_device_id *id)
 	if (!lp)
 		return -ENOMEM;
 
-	if (pdata->period_ns > 0)
-		lp->mode = PWM_BASED;
-	else
-		lp->mode = REGISTER_BASED;
-
 	lp->client = cl;
 	lp->dev = &cl->dev;
-	lp->pdata = pdata;
 	lp->chipname = id->name;
 	lp->chip_id = id->driver_data;
+	lp->pdata = dev_get_platdata(&cl->dev);
+
+	if (!lp->pdata) {
+		ret = lp855x_parse_dt(lp);
+		if (ret < 0)
+			return ret;
+	}
+
+	if (lp->pdata->period_ns > 0)
+		lp->mode = PWM_BASED;
+	else
+		lp->mode = REGISTER_BASED;
+
 	i2c_set_clientdata(cl, lp);
 
 	ret = lp855x_configure(lp);
-- 
2.1.1

--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

^ permalink raw reply related	[flat|nested] 22+ messages in thread

end of thread, other threads:[~2014-12-03  1:33 UTC | newest]

Thread overview: 22+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-11-26 19:11 [PATCH 1/2] backlight/lp855x: Refactor dt parsing code Sean Paul
2014-11-26 19:11 ` Sean Paul
     [not found] ` <1417029064-12460-1-git-send-email-seanpaul-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org>
2014-11-26 19:11   ` [PATCH 2/2] backlight/lp855x: Add supply regulator to lp855x Sean Paul
2014-11-26 19:11     ` Sean Paul
     [not found]     ` <1417029064-12460-2-git-send-email-seanpaul-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org>
2014-11-27  1:32       ` Kim, Milo
2014-11-27  1:32         ` Kim, Milo
     [not found]         ` <54767F43.2060901-l0cyMroinI0@public.gmane.org>
2014-11-27 12:23           ` Sean Paul
2014-11-27 12:23             ` Sean Paul
2014-12-01 21:07           ` [PATCH v2 " Sean Paul
2014-12-01 21:07             ` Sean Paul
     [not found]             ` <1417468079-4990-1-git-send-email-seanpaul-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org>
2014-12-03  0:54               ` Kim, Milo
2014-12-03  0:54                 ` Kim, Milo
     [not found]                 ` <547E5F5C.40406-l0cyMroinI0@public.gmane.org>
2014-12-03  1:01                   ` Sean Paul
2014-12-03  1:01                     ` Sean Paul
     [not found]                     ` <CAOw6vbLB=3An9+Juda=5Yx1vnuCgDsp=ucKNQ3B6AtiLv=FLYg-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2014-12-03  1:15                       ` Kim, Milo
2014-12-03  1:15                         ` Kim, Milo
     [not found]                         ` <547E643A.7070202-l0cyMroinI0@public.gmane.org>
2014-12-03  1:33                           ` Bryan Wu
2014-12-03  1:33                             ` Bryan Wu
2014-11-27  1:32   ` [PATCH 1/2] backlight/lp855x: Refactor dt parsing code Kim, Milo
2014-11-27  1:32     ` Kim, Milo
     [not found]     ` <54767F37.3020006-l0cyMroinI0@public.gmane.org>
2014-11-27 12:22       ` Sean Paul
2014-11-27 12:22         ` Sean Paul

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.