hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

leds: use dev_get_platdata() 

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>
This commit is contained in:
Jingoo Han 2013-07-30 01:07:35 -07:00 committed by Bryan Wu
parent 8465b01827
commit 87aae1ea82
30 changed files with 52 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/leds/leds-88pm860x.c
View File

@ -157,7 +157,7 @@ static int pm860x_led_dt_init(struct platform_device *pdev,
static int pm860x_led_probe(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_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 pm860x_led *data;
struct resource *res; struct resource *res;
int ret = 0; int ret = 0;

6
drivers/leds/leds-adp5520.c
View File

@ -87,7 +87,7 @@ static int adp5520_led_setup(struct adp5520_led *led)
static int adp5520_led_prepare(struct platform_device *pdev) 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; struct device *dev = pdev->dev.parent;
int ret = 0; int ret = 0;
@ -103,7 +103,7 @@ static int adp5520_led_prepare(struct platform_device *pdev)
static int adp5520_led_probe(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 adp5520_led *led, *led_dat;
struct led_info *cur_led; struct led_info *cur_led;
int ret, i; int ret, i;
@ -185,7 +185,7 @@ err:
static int adp5520_led_remove(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; struct adp5520_led *led;
int i; int i;

4
drivers/leds/leds-asic3.c
View File

@ -94,7 +94,7 @@ static int blink_set(struct led_classdev *cdev,
static int asic3_led_probe(struct platform_device *pdev) 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; int ret;
ret = mfd_cell_enable(pdev); ret = mfd_cell_enable(pdev);
@ -127,7 +127,7 @@ out:
static int asic3_led_remove(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); led_classdev_unregister(led->cdev);

4
drivers/leds/leds-atmel-pwm.c
View File

@ -42,7 +42,7 @@ static int pwmled_probe(struct platform_device *pdev)
int i; int i;
int status; int status;
pdata = pdev->dev.platform_data; pdata = dev_get_platdata(&pdev->dev);
if (!pdata || pdata->num_leds < 1) if (!pdata || pdata->num_leds < 1)
return -ENODEV; return -ENODEV;
@ -119,7 +119,7 @@ static int pwmled_remove(struct platform_device *pdev)
struct pwmled *leds; struct pwmled *leds;
unsigned i; unsigned i;
pdata = pdev->dev.platform_data; pdata = dev_get_platdata(&pdev->dev);
leds = platform_get_drvdata(pdev); leds = platform_get_drvdata(pdev);
for (i = 0; i < pdata->num_leds; i++) { for (i = 0; i < pdata->num_leds; i++) {

2
drivers/leds/leds-bd2802.c
View File

@ -684,7 +684,7 @@ static int bd2802_probe(struct i2c_client *client,
} }
led->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); i2c_set_clientdata(client, led);
/* Configure RESET GPIO (L: RESET, H: RESET cancel) */ /* Configure RESET GPIO (L: RESET, H: RESET cancel) */

2
drivers/leds/leds-da903x.c
View File

@ -93,7 +93,7 @@ static void da903x_led_set(struct led_classdev *led_cdev,
static int da903x_led_probe(struct platform_device *pdev) 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; struct da903x_led *led;
int id, ret; int id, ret;

4
drivers/leds/leds-da9052.c
View File

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

2
drivers/leds/leds-gpio.c
View File

@ -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) 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; struct gpio_leds_priv *priv;
int i, ret = 0; int i, ret = 0;

2
drivers/leds/leds-lm3530.c
View File

@ -403,7 +403,7 @@ static DEVICE_ATTR(mode, 0644, lm3530_mode_get, lm3530_mode_set);
static int lm3530_probe(struct i2c_client *client, static int lm3530_probe(struct i2c_client *client,
const struct i2c_device_id *id) 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; struct lm3530_data *drvdata;
int err = 0; int err = 0;

2
drivers/leds/leds-lm3533.c
View File

@ -671,7 +671,7 @@ static int lm3533_led_probe(struct platform_device *pdev)
if (!lm3533) if (!lm3533)
return -EINVAL; return -EINVAL;
pdata = pdev->dev.platform_data; pdata = dev_get_platdata(&pdev->dev);
if (!pdata) { if (!pdata) {
dev_err(&pdev->dev, "no platform data\n"); dev_err(&pdev->dev, "no platform data\n");
return -EINVAL; return -EINVAL;

2
drivers/leds/leds-lm355x.c
View File

@ -423,7 +423,7 @@ static const struct regmap_config lm355x_regmap = {
static int lm355x_probe(struct i2c_client *client, static int lm355x_probe(struct i2c_client *client,
const struct i2c_device_id *id) 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; struct lm355x_chip_data *chip;
int err; int err;

2
drivers/leds/leds-lm3642.c
View File

@ -316,7 +316,7 @@ static const struct regmap_config lm3642_regmap = {
static int lm3642_probe(struct i2c_client *client, static int lm3642_probe(struct i2c_client *client,
const struct i2c_device_id *id) 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; struct lm3642_chip_data *chip;
int err; int err;

5
drivers/leds/leds-lp3944.c
View File

@ -377,7 +377,8 @@ exit:
static int lp3944_probe(struct i2c_client *client, static int lp3944_probe(struct i2c_client *client,
const struct i2c_device_id *id) 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; struct lp3944_data *data;
int err; int err;
@ -413,7 +414,7 @@ static int lp3944_probe(struct i2c_client *client,
static int lp3944_remove(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); struct lp3944_data *data = i2c_get_clientdata(client);
int i; int i;

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

@ -420,7 +420,7 @@ static int lp5521_probe(struct i2c_client *client,
struct lp55xx_platform_data *pdata; struct lp55xx_platform_data *pdata;
struct device_node *np = client->dev.of_node; struct device_node *np = client->dev.of_node;
if (!client->dev.platform_data) { if (!dev_get_platdata(&client->dev)) {
if (np) { if (np) {
ret = lp55xx_of_populate_pdata(&client->dev, np); ret = lp55xx_of_populate_pdata(&client->dev, np);
if (ret < 0) if (ret < 0)
@ -430,7 +430,7 @@ static int lp5521_probe(struct i2c_client *client,
return -EINVAL; return -EINVAL;
} }
} }
pdata = client->dev.platform_data; pdata = dev_get_platdata(&client->dev);
chip = devm_kzalloc(&client->dev, sizeof(*chip), GFP_KERNEL); chip = devm_kzalloc(&client->dev, sizeof(*chip), GFP_KERNEL);
if (!chip) if (!chip)

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

@ -432,7 +432,7 @@ static int lp5523_probe(struct i2c_client *client,
struct lp55xx_platform_data *pdata; struct lp55xx_platform_data *pdata;
struct device_node *np = client->dev.of_node; struct device_node *np = client->dev.of_node;
if (!client->dev.platform_data) { if (!dev_get_platdata(&client->dev)) {
if (np) { if (np) {
ret = lp55xx_of_populate_pdata(&client->dev, np); ret = lp55xx_of_populate_pdata(&client->dev, np);
if (ret < 0) if (ret < 0)
@ -442,7 +442,7 @@ static int lp5523_probe(struct i2c_client *client,
return -EINVAL; return -EINVAL;
} }
} }
pdata = client->dev.platform_data; pdata = dev_get_platdata(&client->dev);
chip = devm_kzalloc(&client->dev, sizeof(*chip), GFP_KERNEL); chip = devm_kzalloc(&client->dev, sizeof(*chip), GFP_KERNEL);
if (!chip) if (!chip)

4
drivers/leds/leds-lp5562.c
View File

@ -518,7 +518,7 @@ static int lp5562_probe(struct i2c_client *client,
struct lp55xx_platform_data *pdata; struct lp55xx_platform_data *pdata;
struct device_node *np = client->dev.of_node; struct device_node *np = client->dev.of_node;
if (!client->dev.platform_data) { if (!dev_get_platdata(&client->dev)) {
if (np) { if (np) {
ret = lp55xx_of_populate_pdata(&client->dev, np); ret = lp55xx_of_populate_pdata(&client->dev, np);
if (ret < 0) if (ret < 0)
@ -528,7 +528,7 @@ static int lp5562_probe(struct i2c_client *client,
return -EINVAL; return -EINVAL;
} }
} }
pdata = client->dev.platform_data; pdata = dev_get_platdata(&client->dev);
chip = devm_kzalloc(&client->dev, sizeof(*chip), GFP_KERNEL); chip = devm_kzalloc(&client->dev, sizeof(*chip), GFP_KERNEL);
if (!chip) if (!chip)

4
drivers/leds/leds-lp8501.c
View File

@ -310,7 +310,7 @@ static int lp8501_probe(struct i2c_client *client,
struct lp55xx_platform_data *pdata; struct lp55xx_platform_data *pdata;
struct device_node *np = client->dev.of_node; struct device_node *np = client->dev.of_node;
if (!client->dev.platform_data) { if (!dev_get_platdata(&client->dev)) {
if (np) { if (np) {
ret = lp55xx_of_populate_pdata(&client->dev, np); ret = lp55xx_of_populate_pdata(&client->dev, np);
if (ret < 0) if (ret < 0)
@ -320,7 +320,7 @@ static int lp8501_probe(struct i2c_client *client,
return -EINVAL; return -EINVAL;
} }
} }
pdata = client->dev.platform_data; pdata = dev_get_platdata(&client->dev);
chip = devm_kzalloc(&client->dev, sizeof(*chip), GFP_KERNEL); chip = devm_kzalloc(&client->dev, sizeof(*chip), GFP_KERNEL);
if (!chip) if (!chip)

4
drivers/leds/leds-lt3593.c
View File

@ -135,7 +135,7 @@ static void delete_lt3593_led(struct lt3593_led_data *led)
static int lt3593_led_probe(struct platform_device *pdev) 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; struct lt3593_led_data *leds_data;
int i, ret = 0; int i, ret = 0;
@ -169,7 +169,7 @@ err:
static int lt3593_led_remove(struct platform_device *pdev) static int lt3593_led_remove(struct platform_device *pdev)
{ {
int i; 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; struct lt3593_led_data *leds_data;
leds_data = platform_get_drvdata(pdev); leds_data = platform_get_drvdata(pdev);

6
drivers/leds/leds-netxbig.c
View File

@ -306,7 +306,7 @@ create_netxbig_led(struct platform_device *pdev,
struct netxbig_led_data *led_dat, struct netxbig_led_data *led_dat,
const struct netxbig_led *template) 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; int ret;
spin_lock_init(&led_dat->lock); spin_lock_init(&led_dat->lock);
@ -354,7 +354,7 @@ create_netxbig_led(struct platform_device *pdev,
static int netxbig_led_probe(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; struct netxbig_led_data *leds_data;
int i; int i;
int ret; int ret;
@ -391,7 +391,7 @@ err_free_leds:
static int netxbig_led_remove(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; struct netxbig_led_data *leds_data;
int i; int i;

2
drivers/leds/leds-ns2.c
View File

@ -321,7 +321,7 @@ static inline int sizeof_ns2_led_priv(int num_leds)
static int ns2_led_probe(struct platform_device *pdev) 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; struct ns2_led_priv *priv;
int i; int i;
int ret; int ret;

3
drivers/leds/leds-pca9532.c
View File

@ -446,7 +446,8 @@ static int pca9532_probe(struct i2c_client *client,
const struct i2c_device_id *id) const struct i2c_device_id *id)
{ {
struct pca9532_data *data = i2c_get_clientdata(client); 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) if (!pca9532_pdata)
return -EIO; return -EIO;

2
drivers/leds/leds-pca955x.c
View File

@ -267,7 +267,7 @@ static int pca955x_probe(struct i2c_client *client,
chip = &pca955x_chipdefs[id->driver_data]; chip = &pca955x_chipdefs[id->driver_data];
adapter = to_i2c_adapter(client->dev.parent); 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 */ /* Make sure the slave address / chip type combo given is possible */
if ((client->addr & ~((1 << chip->slv_addr_shift) - 1)) != if ((client->addr & ~((1 << chip->slv_addr_shift) - 1)) !=

2
drivers/leds/leds-pca9633.c
View File

@ -287,7 +287,7 @@ static int pca9633_probe(struct i2c_client *client,
struct pca9633_platform_data *pdata; struct pca9633_platform_data *pdata;
int i, err; int i, err;
pdata = client->dev.platform_data; pdata = dev_get_platdata(&client->dev);
if (!pdata) { if (!pdata) {
pdata = pca9633_dt_init(client); pdata = pca9633_dt_init(client);

2
drivers/leds/leds-pwm.c
View File

@ -147,7 +147,7 @@ err:
static int led_pwm_probe(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; struct led_pwm_priv *priv;
int i, ret = 0; int i, ret = 0;

3
drivers/leds/leds-regulator.c
View File

@ -142,7 +142,8 @@ static void regulator_led_brightness_set(struct led_classdev *led_cdev,
static int regulator_led_probe(struct platform_device *pdev) 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_led *led;
struct regulator *vcc; struct regulator *vcc;
int ret = 0; int ret = 0;

12
drivers/leds/leds-renesas-tpu.c
View File

@ -65,7 +65,7 @@ static DEFINE_SPINLOCK(r_tpu_lock);
static inline u16 r_tpu_read(struct r_tpu_priv *p, int reg_nr) 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; void __iomem *base = p->mapbase;
unsigned long offs = reg_nr << 2; unsigned long offs = reg_nr << 2;
@ -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) 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; void __iomem *base = p->mapbase;
unsigned long offs = reg_nr << 2; unsigned long offs = reg_nr << 2;
@ -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) 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; unsigned long flags;
u16 value; u16 value;
@ -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) 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 prescaler[] = { 1, 4, 16, 64 };
int k, ret; int k, ret;
unsigned long rate, tmp; unsigned long rate, tmp;
@ -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, static void r_tpu_set_pin(struct r_tpu_priv *p, enum r_tpu_pin new_state,
enum led_brightness brightness) 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 == new_state) {
if (p->pin_state == R_TPU_PIN_GPIO) if (p->pin_state == R_TPU_PIN_GPIO)
@ -241,7 +241,7 @@ static void r_tpu_set_brightness(struct led_classdev *ldev,
static int r_tpu_probe(struct platform_device *pdev) 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 r_tpu_priv *p;
struct resource *res; struct resource *res;
int ret; int ret;

2
drivers/leds/leds-s3c24xx.c
View File

@ -71,7 +71,7 @@ static int s3c24xx_led_remove(struct platform_device *dev)
static int s3c24xx_led_probe(struct platform_device *dev) static int s3c24xx_led_probe(struct platform_device *dev)
{ {
struct s3c24xx_led_platdata *pdata = dev->dev.platform_data; struct s3c24xx_led_platdata *pdata = dev_get_platdata(&dev->dev);
struct s3c24xx_gpio_led *led; struct s3c24xx_gpio_led *led;
int ret; int ret;

2
drivers/leds/leds-tca6507.c
View File

@ -737,7 +737,7 @@ static int tca6507_probe(struct i2c_client *client,
int i = 0; int i = 0;
adapter = to_i2c_adapter(client->dev.parent); adapter = to_i2c_adapter(client->dev.parent);
pdata = client->dev.platform_data; pdata = dev_get_platdata(&client->dev);
if (!i2c_check_functionality(adapter, I2C_FUNC_I2C)) if (!i2c_check_functionality(adapter, I2C_FUNC_I2C))
return -EIO; return -EIO;

4
drivers/leds/leds-wm831x-status.c
View File

@ -246,8 +246,8 @@ static int wm831x_status_probe(struct platform_device *pdev)
drvdata->wm831x = wm831x; drvdata->wm831x = wm831x;
drvdata->reg = res->start; drvdata->reg = res->start;
if (wm831x->dev->platform_data) if (dev_get_platdata(wm831x->dev))
chip_pdata = wm831x->dev->platform_data; chip_pdata = dev_get_platdata(wm831x->dev);
else else
chip_pdata = NULL; chip_pdata = NULL;

2
drivers/leds/leds-wm8350.c
View File

@ -203,7 +203,7 @@ static int wm8350_led_probe(struct platform_device *pdev)
{ {
struct regulator *isink, *dcdc; struct regulator *isink, *dcdc;
struct wm8350_led *led; struct wm8350_led *led;
struct wm8350_led_platform_data *pdata = pdev->dev.platform_data; struct wm8350_led_platform_data *pdata = dev_get_platdata(&pdev->dev);
int i; int i;
if (pdata == NULL) { if (pdata == NULL) {