diff options
Diffstat (limited to 'drivers/leds/leds-mc13783.c')
-rw-r--r-- | drivers/leds/leds-mc13783.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/leds/leds-mc13783.c b/drivers/leds/leds-mc13783.c index 126ca7955f6e..f369e56d6547 100644 --- a/drivers/leds/leds-mc13783.c +++ b/drivers/leds/leds-mc13783.c | |||
@@ -22,7 +22,6 @@ | |||
22 | #include <linux/leds.h> | 22 | #include <linux/leds.h> |
23 | #include <linux/workqueue.h> | 23 | #include <linux/workqueue.h> |
24 | #include <linux/mfd/mc13783.h> | 24 | #include <linux/mfd/mc13783.h> |
25 | #include <linux/mfd/core.h> | ||
26 | #include <linux/slab.h> | 25 | #include <linux/slab.h> |
27 | 26 | ||
28 | struct mc13783_led { | 27 | struct mc13783_led { |
@@ -184,7 +183,7 @@ static int __devinit mc13783_led_setup(struct mc13783_led *led, int max_current) | |||
184 | 183 | ||
185 | static int __devinit mc13783_leds_prepare(struct platform_device *pdev) | 184 | static int __devinit mc13783_leds_prepare(struct platform_device *pdev) |
186 | { | 185 | { |
187 | struct mc13783_leds_platform_data *pdata = mfd_get_data(pdev); | 186 | struct mc13783_leds_platform_data *pdata = dev_get_platdata(&pdev->dev); |
188 | struct mc13783 *dev = dev_get_drvdata(pdev->dev.parent); | 187 | struct mc13783 *dev = dev_get_drvdata(pdev->dev.parent); |
189 | int ret = 0; | 188 | int ret = 0; |
190 | int reg = 0; | 189 | int reg = 0; |
@@ -265,7 +264,7 @@ out: | |||
265 | 264 | ||
266 | static int __devinit mc13783_led_probe(struct platform_device *pdev) | 265 | static int __devinit mc13783_led_probe(struct platform_device *pdev) |
267 | { | 266 | { |
268 | struct mc13783_leds_platform_data *pdata = mfd_get_data(pdev); | 267 | struct mc13783_leds_platform_data *pdata = dev_get_platdata(&pdev->dev); |
269 | struct mc13783_led_platform_data *led_cur; | 268 | struct mc13783_led_platform_data *led_cur; |
270 | struct mc13783_led *led, *led_dat; | 269 | struct mc13783_led *led, *led_dat; |
271 | int ret, i; | 270 | int ret, i; |
@@ -352,7 +351,7 @@ err_free: | |||
352 | 351 | ||
353 | static int __devexit mc13783_led_remove(struct platform_device *pdev) | 352 | static int __devexit mc13783_led_remove(struct platform_device *pdev) |
354 | { | 353 | { |
355 | struct mc13783_leds_platform_data *pdata = mfd_get_data(pdev); | 354 | struct mc13783_leds_platform_data *pdata = dev_get_platdata(&pdev->dev); |
356 | struct mc13783_led *led = platform_get_drvdata(pdev); | 355 | struct mc13783_led *led = platform_get_drvdata(pdev); |
357 | struct mc13783 *dev = dev_get_drvdata(pdev->dev.parent); | 356 | struct mc13783 *dev = dev_get_drvdata(pdev->dev.parent); |
358 | int i; | 357 | int i; |