Skip to content

Commit

Permalink
leds: use dev_get_platdata()
Browse files Browse the repository at this point in the history 
Use the wrapper function for retrieving the platform data instead of
accessing dev->platform_data directly.

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Signed-off-by: Bryan Wu <cooloney@gmail.com>
  • Loading branch information
@cooloney
Jingoo Han authored and cooloney committed Aug 27, 2013
1 parent 8465b01 commit 87aae1e
Show file tree
Hide file tree
Showing 30 changed files with 52 additions and 49 deletions.
2 changes: 1 addition & 1 deletion drivers/leds/leds-88pm860x.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ static int pm860x_led_dt_init(struct platform_device *pdev,
static int pm860x_led_probe(struct platform_device *pdev)
{
struct pm860x_chip *chip = dev_get_drvdata(pdev->dev.parent);
struct pm860x_led_pdata *pdata = pdev->dev.platform_data;
struct pm860x_led_pdata *pdata = dev_get_platdata(&pdev->dev);
struct pm860x_led *data;
struct resource *res;
int ret = 0;
Expand Down
6 changes: 3 additions & 3 deletions drivers/leds/leds-adp5520.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ static int adp5520_led_setup(struct adp5520_led *led)

static int adp5520_led_prepare(struct platform_device *pdev)
{
struct adp5520_leds_platform_data *pdata = pdev->dev.platform_data;
struct adp5520_leds_platform_data *pdata = dev_get_platdata(&pdev->dev);
struct device *dev = pdev->dev.parent;
int ret = 0;

Expand All @@ -103,7 +103,7 @@ static int adp5520_led_prepare(struct platform_device *pdev)

static int adp5520_led_probe(struct platform_device *pdev)
{
struct adp5520_leds_platform_data *pdata = pdev->dev.platform_data;
struct adp5520_leds_platform_data *pdata = dev_get_platdata(&pdev->dev);
struct adp5520_led *led, *led_dat;
struct led_info *cur_led;
int ret, i;
Expand Down Expand Up @@ -185,7 +185,7 @@ static int adp5520_led_probe(struct platform_device *pdev)

static int adp5520_led_remove(struct platform_device *pdev)
{
struct adp5520_leds_platform_data *pdata = pdev->dev.platform_data;
struct adp5520_leds_platform_data *pdata = dev_get_platdata(&pdev->dev);
struct adp5520_led *led;
int i;

Expand Down
4 changes: 2 additions & 2 deletions drivers/leds/leds-asic3.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ static int blink_set(struct led_classdev *cdev,

static int asic3_led_probe(struct platform_device *pdev)
{
struct asic3_led *led = pdev->dev.platform_data;
struct asic3_led *led = dev_get_platdata(&pdev->dev);
int ret;

ret = mfd_cell_enable(pdev);
Expand Down Expand Up @@ -127,7 +127,7 @@ static int asic3_led_probe(struct platform_device *pdev)

static int asic3_led_remove(struct platform_device *pdev)
{
struct asic3_led *led = pdev->dev.platform_data;
struct asic3_led *led = dev_get_platdata(&pdev->dev);

led_classdev_unregister(led->cdev);

Expand Down
4 changes: 2 additions & 2 deletions drivers/leds/leds-atmel-pwm.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ static int pwmled_probe(struct platform_device *pdev)
int i;
int status;

pdata = pdev->dev.platform_data;
pdata = dev_get_platdata(&pdev->dev);
if (!pdata || pdata->num_leds < 1)
return -ENODEV;

Expand Down Expand Up @@ -119,7 +119,7 @@ static int pwmled_remove(struct platform_device *pdev)
struct pwmled *leds;
unsigned i;

pdata = pdev->dev.platform_data;
pdata = dev_get_platdata(&pdev->dev);
leds = platform_get_drvdata(pdev);

for (i = 0; i < pdata->num_leds; i++) {
Expand Down
2 changes: 1 addition & 1 deletion drivers/leds/leds-bd2802.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -684,7 +684,7 @@ static int bd2802_probe(struct i2c_client *client,
}

led->client = client;
pdata = led->pdata = client->dev.platform_data;
pdata = led->pdata = dev_get_platdata(&client->dev);
i2c_set_clientdata(client, led);

/* Configure RESET GPIO (L: RESET, H: RESET cancel) */
Expand Down
2 changes: 1 addition & 1 deletion drivers/leds/leds-da903x.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ static void da903x_led_set(struct led_classdev *led_cdev,

static int da903x_led_probe(struct platform_device *pdev)
{
struct led_info *pdata = pdev->dev.platform_data;
struct led_info *pdata = dev_get_platdata(&pdev->dev);
struct da903x_led *led;
int id, ret;

Expand Down
4 changes: 2 additions & 2 deletions drivers/leds/leds-da9052.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ static int da9052_led_probe(struct platform_device *pdev)
int i;

da9052 = dev_get_drvdata(pdev->dev.parent);
pdata = da9052->dev->platform_data;
pdata = dev_get_platdata(da9052->dev);
if (pdata == NULL) {
dev_err(&pdev->dev, "No platform data\n");
goto err;
Expand Down Expand Up @@ -185,7 +185,7 @@ static int da9052_led_remove(struct platform_device *pdev)
int i;

da9052 = dev_get_drvdata(pdev->dev.parent);
pdata = da9052->dev->platform_data;
pdata = dev_get_platdata(da9052->dev);
pled = pdata->pled;

for (i = 0; i < pled->num_leds; i++) {
Expand Down
2 changes: 1 addition & 1 deletion drivers/leds/leds-gpio.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ static struct gpio_leds_priv *gpio_leds_create_of(struct platform_device *pdev)

static int gpio_led_probe(struct platform_device *pdev)
{
struct gpio_led_platform_data *pdata = pdev->dev.platform_data;
struct gpio_led_platform_data *pdata = dev_get_platdata(&pdev->dev);
struct gpio_leds_priv *priv;
int i, ret = 0;

Expand Down
2 changes: 1 addition & 1 deletion drivers/leds/leds-lm3530.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -403,7 +403,7 @@ static DEVICE_ATTR(mode, 0644, lm3530_mode_get, lm3530_mode_set);
static int lm3530_probe(struct i2c_client *client,
const struct i2c_device_id *id)
{
struct lm3530_platform_data *pdata = client->dev.platform_data;
struct lm3530_platform_data *pdata = dev_get_platdata(&client->dev);
struct lm3530_data *drvdata;
int err = 0;

Expand Down
2 changes: 1 addition & 1 deletion drivers/leds/leds-lm3533.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -671,7 +671,7 @@ static int lm3533_led_probe(struct platform_device *pdev)
if (!lm3533)
return -EINVAL;

pdata = pdev->dev.platform_data;
pdata = dev_get_platdata(&pdev->dev);
if (!pdata) {
dev_err(&pdev->dev, "no platform data\n");
return -EINVAL;
Expand Down
2 changes: 1 addition & 1 deletion drivers/leds/leds-lm355x.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -423,7 +423,7 @@ static const struct regmap_config lm355x_regmap = {
static int lm355x_probe(struct i2c_client *client,
const struct i2c_device_id *id)
{
struct lm355x_platform_data *pdata = client->dev.platform_data;
struct lm355x_platform_data *pdata = dev_get_platdata(&client->dev);
struct lm355x_chip_data *chip;

int err;
Expand Down
2 changes: 1 addition & 1 deletion drivers/leds/leds-lm3642.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,7 @@ static const struct regmap_config lm3642_regmap = {
static int lm3642_probe(struct i2c_client *client,
const struct i2c_device_id *id)
{
struct lm3642_platform_data *pdata = client->dev.platform_data;
struct lm3642_platform_data *pdata = dev_get_platdata(&client->dev);
struct lm3642_chip_data *chip;

int err;
Expand Down
5 changes: 3 additions & 2 deletions drivers/leds/leds-lp3944.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -377,7 +377,8 @@ static int lp3944_configure(struct i2c_client *client,
static int lp3944_probe(struct i2c_client *client,
const struct i2c_device_id *id)
{
struct lp3944_platform_data *lp3944_pdata = client->dev.platform_data;
struct lp3944_platform_data *lp3944_pdata =
dev_get_platdata(&client->dev);
struct lp3944_data *data;
int err;

Expand Down Expand Up @@ -413,7 +414,7 @@ static int lp3944_probe(struct i2c_client *client,

static int lp3944_remove(struct i2c_client *client)
{
struct lp3944_platform_data *pdata = client->dev.platform_data;
struct lp3944_platform_data *pdata = dev_get_platdata(&client->dev);
struct lp3944_data *data = i2c_get_clientdata(client);
int i;

Expand Down
4 changes: 2 additions & 2 deletions drivers/leds/leds-lp5521.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -420,7 +420,7 @@ static int lp5521_probe(struct i2c_client *client,
struct lp55xx_platform_data *pdata;
struct device_node *np = client->dev.of_node;

if (!client->dev.platform_data) {
if (!dev_get_platdata(&client->dev)) {
if (np) {
ret = lp55xx_of_populate_pdata(&client->dev, np);
if (ret < 0)
Expand All @@ -430,7 +430,7 @@ static int lp5521_probe(struct i2c_client *client,
return -EINVAL;
}
}
pdata = client->dev.platform_data;
pdata = dev_get_platdata(&client->dev);

chip = devm_kzalloc(&client->dev, sizeof(*chip), GFP_KERNEL);
if (!chip)
Expand Down
4 changes: 2 additions & 2 deletions drivers/leds/leds-lp5523.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -432,7 +432,7 @@ static int lp5523_probe(struct i2c_client *client,
struct lp55xx_platform_data *pdata;
struct device_node *np = client->dev.of_node;

if (!client->dev.platform_data) {
if (!dev_get_platdata(&client->dev)) {
if (np) {
ret = lp55xx_of_populate_pdata(&client->dev, np);
if (ret < 0)
Expand All @@ -442,7 +442,7 @@ static int lp5523_probe(struct i2c_client *client,
return -EINVAL;
}
}
pdata = client->dev.platform_data;
pdata = dev_get_platdata(&client->dev);

chip = devm_kzalloc(&client->dev, sizeof(*chip), GFP_KERNEL);
if (!chip)
Expand Down
4 changes: 2 additions & 2 deletions drivers/leds/leds-lp5562.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -518,7 +518,7 @@ static int lp5562_probe(struct i2c_client *client,
struct lp55xx_platform_data *pdata;
struct device_node *np = client->dev.of_node;

if (!client->dev.platform_data) {
if (!dev_get_platdata(&client->dev)) {
if (np) {
ret = lp55xx_of_populate_pdata(&client->dev, np);
if (ret < 0)
Expand All @@ -528,7 +528,7 @@ static int lp5562_probe(struct i2c_client *client,
return -EINVAL;
}
}
pdata = client->dev.platform_data;
pdata = dev_get_platdata(&client->dev);

chip = devm_kzalloc(&client->dev, sizeof(*chip), GFP_KERNEL);
if (!chip)
Expand Down
4 changes: 2 additions & 2 deletions drivers/leds/leds-lp8501.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -310,7 +310,7 @@ static int lp8501_probe(struct i2c_client *client,
struct lp55xx_platform_data *pdata;
struct device_node *np = client->dev.of_node;

if (!client->dev.platform_data) {
if (!dev_get_platdata(&client->dev)) {
if (np) {
ret = lp55xx_of_populate_pdata(&client->dev, np);
if (ret < 0)
Expand All @@ -320,7 +320,7 @@ static int lp8501_probe(struct i2c_client *client,
return -EINVAL;
}
}
pdata = client->dev.platform_data;
pdata = dev_get_platdata(&client->dev);

chip = devm_kzalloc(&client->dev, sizeof(*chip), GFP_KERNEL);
if (!chip)
Expand Down
4 changes: 2 additions & 2 deletions drivers/leds/leds-lt3593.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ static void delete_lt3593_led(struct lt3593_led_data *led)

static int lt3593_led_probe(struct platform_device *pdev)
{
struct gpio_led_platform_data *pdata = pdev->dev.platform_data;
struct gpio_led_platform_data *pdata = dev_get_platdata(&pdev->dev);
struct lt3593_led_data *leds_data;
int i, ret = 0;

Expand Down Expand Up @@ -169,7 +169,7 @@ static int lt3593_led_probe(struct platform_device *pdev)
static int lt3593_led_remove(struct platform_device *pdev)
{
int i;
struct gpio_led_platform_data *pdata = pdev->dev.platform_data;
struct gpio_led_platform_data *pdata = dev_get_platdata(&pdev->dev);
struct lt3593_led_data *leds_data;

leds_data = platform_get_drvdata(pdev);
Expand Down
6 changes: 3 additions & 3 deletions drivers/leds/leds-netxbig.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,7 @@ create_netxbig_led(struct platform_device *pdev,
struct netxbig_led_data *led_dat,
const struct netxbig_led *template)
{
struct netxbig_led_platform_data *pdata = pdev->dev.platform_data;
struct netxbig_led_platform_data *pdata = dev_get_platdata(&pdev->dev);
int ret;

spin_lock_init(&led_dat->lock);
Expand Down Expand Up @@ -354,7 +354,7 @@ create_netxbig_led(struct platform_device *pdev,

static int netxbig_led_probe(struct platform_device *pdev)
{
struct netxbig_led_platform_data *pdata = pdev->dev.platform_data;
struct netxbig_led_platform_data *pdata = dev_get_platdata(&pdev->dev);
struct netxbig_led_data *leds_data;
int i;
int ret;
Expand Down Expand Up @@ -391,7 +391,7 @@ static int netxbig_led_probe(struct platform_device *pdev)

static int netxbig_led_remove(struct platform_device *pdev)
{
struct netxbig_led_platform_data *pdata = pdev->dev.platform_data;
struct netxbig_led_platform_data *pdata = dev_get_platdata(&pdev->dev);
struct netxbig_led_data *leds_data;
int i;

Expand Down
2 changes: 1 addition & 1 deletion drivers/leds/leds-ns2.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,7 @@ static inline int sizeof_ns2_led_priv(int num_leds)

static int ns2_led_probe(struct platform_device *pdev)
{
struct ns2_led_platform_data *pdata = pdev->dev.platform_data;
struct ns2_led_platform_data *pdata = dev_get_platdata(&pdev->dev);
struct ns2_led_priv *priv;
int i;
int ret;
Expand Down
3 changes: 2 additions & 1 deletion drivers/leds/leds-pca9532.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -446,7 +446,8 @@ static int pca9532_probe(struct i2c_client *client,
const struct i2c_device_id *id)
{
struct pca9532_data *data = i2c_get_clientdata(client);
struct pca9532_platform_data *pca9532_pdata = client->dev.platform_data;
struct pca9532_platform_data *pca9532_pdata =
dev_get_platdata(&client->dev);

if (!pca9532_pdata)
return -EIO;
Expand Down
2 changes: 1 addition & 1 deletion drivers/leds/leds-pca955x.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,7 @@ static int pca955x_probe(struct i2c_client *client,

chip = &pca955x_chipdefs[id->driver_data];
adapter = to_i2c_adapter(client->dev.parent);
pdata = client->dev.platform_data;
pdata = dev_get_platdata(&client->dev);

/* Make sure the slave address / chip type combo given is possible */
if ((client->addr & ~((1 << chip->slv_addr_shift) - 1)) !=
Expand Down
2 changes: 1 addition & 1 deletion drivers/leds/leds-pca9633.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,7 @@ static int pca9633_probe(struct i2c_client *client,
struct pca9633_platform_data *pdata;
int i, err;

pdata = client->dev.platform_data;
pdata = dev_get_platdata(&client->dev);

if (!pdata) {
pdata = pca9633_dt_init(client);
Expand Down
2 changes: 1 addition & 1 deletion drivers/leds/leds-pwm.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ static struct led_pwm_priv *led_pwm_create_of(struct platform_device *pdev)

static int led_pwm_probe(struct platform_device *pdev)
{
struct led_pwm_platform_data *pdata = pdev->dev.platform_data;
struct led_pwm_platform_data *pdata = dev_get_platdata(&pdev->dev);
struct led_pwm_priv *priv;
int i, ret = 0;

Expand Down
3 changes: 2 additions & 1 deletion drivers/leds/leds-regulator.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,8 @@ static void regulator_led_brightness_set(struct led_classdev *led_cdev,

static int regulator_led_probe(struct platform_device *pdev)
{
struct led_regulator_platform_data *pdata = pdev->dev.platform_data;
struct led_regulator_platform_data *pdata =
dev_get_platdata(&pdev->dev);
struct regulator_led *led;
struct regulator *vcc;
int ret = 0;
Expand Down
12 changes: 6 additions & 6 deletions drivers/leds/leds-renesas-tpu.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ static DEFINE_SPINLOCK(r_tpu_lock);

static inline u16 r_tpu_read(struct r_tpu_priv *p, int reg_nr)
{
struct led_renesas_tpu_config *cfg = p->pdev->dev.platform_data;
struct led_renesas_tpu_config *cfg = dev_get_platdata(&p->pdev->dev);
void __iomem *base = p->mapbase;
unsigned long offs = reg_nr << 2;

Expand All @@ -77,7 +77,7 @@ static inline u16 r_tpu_read(struct r_tpu_priv *p, int reg_nr)

static inline void r_tpu_write(struct r_tpu_priv *p, int reg_nr, u16 value)
{
struct led_renesas_tpu_config *cfg = p->pdev->dev.platform_data;
struct led_renesas_tpu_config *cfg = dev_get_platdata(&p->pdev->dev);
void __iomem *base = p->mapbase;
unsigned long offs = reg_nr << 2;

Expand All @@ -91,7 +91,7 @@ static inline void r_tpu_write(struct r_tpu_priv *p, int reg_nr, u16 value)

static void r_tpu_start_stop_ch(struct r_tpu_priv *p, int start)
{
struct led_renesas_tpu_config *cfg = p->pdev->dev.platform_data;
struct led_renesas_tpu_config *cfg = dev_get_platdata(&p->pdev->dev);
unsigned long flags;
u16 value;

Expand All @@ -110,7 +110,7 @@ static void r_tpu_start_stop_ch(struct r_tpu_priv *p, int start)

static int r_tpu_enable(struct r_tpu_priv *p, enum led_brightness brightness)
{
struct led_renesas_tpu_config *cfg = p->pdev->dev.platform_data;
struct led_renesas_tpu_config *cfg = dev_get_platdata(&p->pdev->dev);
int prescaler[] = { 1, 4, 16, 64 };
int k, ret;
unsigned long rate, tmp;
Expand Down Expand Up @@ -190,7 +190,7 @@ static void r_tpu_disable(struct r_tpu_priv *p)
static void r_tpu_set_pin(struct r_tpu_priv *p, enum r_tpu_pin new_state,
enum led_brightness brightness)
{
struct led_renesas_tpu_config *cfg = p->pdev->dev.platform_data;
struct led_renesas_tpu_config *cfg = dev_get_platdata(&p->pdev->dev);

if (p->pin_state == new_state) {
if (p->pin_state == R_TPU_PIN_GPIO)
Expand Down Expand Up @@ -241,7 +241,7 @@ static void r_tpu_set_brightness(struct led_classdev *ldev,

static int r_tpu_probe(struct platform_device *pdev)
{
struct led_renesas_tpu_config *cfg = pdev->dev.platform_data;
struct led_renesas_tpu_config *cfg = dev_get_platdata(&pdev->dev);
struct r_tpu_priv *p;
struct resource *res;
int ret;
Expand Down
Loading

0 comments on commit 87aae1e

Please sign in to comment.