redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

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>
hifive-unleashed-5.1
Milo(Woogyom) Kim 2013-02-05 18:03:08 +09:00 committed by Bryan Wu
parent 945c700746
commit 6a0c9a4796
2 changed files with 44 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
drivers/leds/leds-lp5521.c
View File

@ -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;
old_chip->pdata = old_pdata;
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);
i2c_set_clientdata(client, led);
ret = lp5521_init_device(old_chip);
if (ret)

36
drivers/leds/leds-lp5523.c
View File

@ -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;
old_chip->pdata = old_pdata;
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);
i2c_set_clientdata(client, led);
ret = lp5523_init_device(old_chip);
if (ret)