summaryrefslogtreecommitdiffstats
path: root/drivers/leds
diff options
context:
space:
mode:
authorMilo(Woogyom) Kim <milo.kim@ti.com>2013-02-05 18:03:08 +0900
committerBryan Wu <cooloney@gmail.com>2013-02-06 15:59:26 -0800
commit6a0c9a47963cc72c68713923ead60d1e72e7136c (patch)
treeeafe47fca8ae4674e48ed054d515d66711844fb7 /drivers/leds
parent945c700746cbfa3375bf88123c2cf6c210f4cc2c (diff)
downloadop-kernel-dev-6a0c9a47963cc72c68713923ead60d1e72e7136c.zip
op-kernel-dev-6a0c9a47963cc72c68713923ead60d1e72e7136c.tar.gz
leds-lp55xx: use common lp55xx data structure in _probe()
LP5521 and LP5523 data structures have common features. Use common lp55xx data structures rather than chip specific data. Legacy code in probe is replaced with this new data structures. lp55xx_chip : Common data between lp5521_chip and lp5523_chip lp55xx_led : Common LED structure between lp5521_led and lp5523_led lp55xx_platform_data : Common platform data between lp5521_platform_data and lp5523_platform_data Signed-off-by: Milo(Woogyom) Kim <milo.kim@ti.com> Signed-off-by: Bryan Wu <cooloney@gmail.com>
Diffstat (limited to 'drivers/leds')
-rw-r--r--drivers/leds/leds-lp5521.c36
-rw-r--r--drivers/leds/leds-lp5523.c36
2 files changed, 44 insertions, 28 deletions
diff --git a/drivers/leds/leds-lp5521.c b/drivers/leds/leds-lp5521.c
index 8ef8f44b..1eab155 100644
--- a/drivers/leds/leds-lp5521.c
+++ b/drivers/leds/leds-lp5521.c
@@ -34,6 +34,9 @@
#include <linux/leds-lp5521.h>
#include <linux/workqueue.h>
#include <linux/slab.h>
+#include <linux/platform_data/leds-lp55xx.h>
+
+#include "leds-lp55xx-common.h"
#define LP5521_PROGRAM_LENGTH 32 /* in bytes */
@@ -872,27 +875,32 @@ static void lp5521_unregister_leds(struct lp5521_chip *chip)
static int lp5521_probe(struct i2c_client *client,
const struct i2c_device_id *id)
{
- struct lp5521_chip *old_chip;
- struct lp5521_platform_data *old_pdata;
+ struct lp5521_chip *old_chip = NULL;
int ret;
+ struct lp55xx_chip *chip;
+ struct lp55xx_led *led;
+ struct lp55xx_platform_data *pdata = client->dev.platform_data;
- old_chip = devm_kzalloc(&client->dev, sizeof(*old_chip), GFP_KERNEL);
- if (!old_chip)
- return -ENOMEM;
-
- i2c_set_clientdata(client, old_chip);
- old_chip->client = client;
-
- old_pdata = client->dev.platform_data;
-
- if (!old_pdata) {
+ if (!pdata) {
dev_err(&client->dev, "no platform data\n");
return -EINVAL;
}
- mutex_init(&old_chip->lock);
+ chip = devm_kzalloc(&client->dev, sizeof(*chip), GFP_KERNEL);
+ if (!chip)
+ return -ENOMEM;
+
+ led = devm_kzalloc(&client->dev,
+ sizeof(*led) * pdata->num_channels, GFP_KERNEL);
+ if (!led)
+ return -ENOMEM;
+
+ chip->cl = client;
+ chip->pdata = pdata;
+
+ mutex_init(&chip->lock);
- old_chip->pdata = old_pdata;
+ i2c_set_clientdata(client, led);
ret = lp5521_init_device(old_chip);
if (ret)
diff --git a/drivers/leds/leds-lp5523.c b/drivers/leds/leds-lp5523.c
index 49b9762..71bda36 100644
--- a/drivers/leds/leds-lp5523.c
+++ b/drivers/leds/leds-lp5523.c
@@ -34,6 +34,9 @@
#include <linux/leds-lp5523.h>
#include <linux/workqueue.h>
#include <linux/slab.h>
+#include <linux/platform_data/leds-lp55xx.h>
+
+#include "leds-lp55xx-common.h"
#define LP5523_REG_ENABLE 0x00
#define LP5523_REG_OP_MODE 0x01
@@ -1010,27 +1013,32 @@ static void lp5523_deinit_device(struct lp5523_chip *chip)
static int lp5523_probe(struct i2c_client *client,
const struct i2c_device_id *id)
{
- struct lp5523_chip *old_chip;
- struct lp5523_platform_data *old_pdata;
+ struct lp5523_chip *old_chip = NULL;
int ret, i;
+ struct lp55xx_chip *chip;
+ struct lp55xx_led *led;
+ struct lp55xx_platform_data *pdata = client->dev.platform_data;
- old_chip = devm_kzalloc(&client->dev, sizeof(*old_chip), GFP_KERNEL);
- if (!old_chip)
- return -ENOMEM;
-
- i2c_set_clientdata(client, old_chip);
- old_chip->client = client;
-
- old_pdata = client->dev.platform_data;
-
- if (!old_pdata) {
+ if (!pdata) {
dev_err(&client->dev, "no platform data\n");
return -EINVAL;
}
- mutex_init(&old_chip->lock);
+ chip = devm_kzalloc(&client->dev, sizeof(*chip), GFP_KERNEL);
+ if (!chip)
+ return -ENOMEM;
+
+ led = devm_kzalloc(&client->dev,
+ sizeof(*led) * pdata->num_channels, GFP_KERNEL);
+ if (!led)
+ return -ENOMEM;
+
+ chip->cl = client;
+ chip->pdata = pdata;
+
+ mutex_init(&chip->lock);
- old_chip->pdata = old_pdata;
+ i2c_set_clientdata(client, led);
ret = lp5523_init_device(old_chip);
if (ret)
OpenPOWER on IntegriCloud