diff options
author | Samuel Ortiz <sameo@linux.intel.com> | 2011-04-06 10:26:56 -0400 |
---|---|---|
committer | Samuel Ortiz <sameo@linux.intel.com> | 2011-05-26 13:45:12 -0400 |
commit | 07259a7092e47b9fbb5c8bfdad45fa4c7dbbc051 (patch) | |
tree | 73d3c059141e3b418ac40b3f63a165fc1b326013 /drivers/leds | |
parent | a7c98ce25cfa600bd614134a82d22bcb7bcb9d65 (diff) |
mfd: Use mfd cell platform_data for 88pm860x cells platform bits
With the addition of a platform device mfd_cell pointer, MFD drivers
can go back to passing platform back to their sub drivers.
This allows for an mfd_cell->mfd_data removal and thus keep the
sub drivers MFD agnostic. This is mostly needed for non MFD aware
sub drivers.
Cc: Mark Brown <broonie@opensource.wolfsonmicro.com>
Cc: Liam Girdwood <lrg@slimlogic.co.uk>
Cc: Richard Purdie <rpurdie@rpsys.net>
Acked-by: Haojian Zhuang <haojian.zhuang@marvell.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers/leds')
-rw-r--r-- | drivers/leds/leds-88pm860x.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/leds/leds-88pm860x.c b/drivers/leds/leds-88pm860x.c index 416def84d045..0d4c16678ace 100644 --- a/drivers/leds/leds-88pm860x.c +++ b/drivers/leds/leds-88pm860x.c | |||
@@ -17,7 +17,6 @@ | |||
17 | #include <linux/leds.h> | 17 | #include <linux/leds.h> |
18 | #include <linux/slab.h> | 18 | #include <linux/slab.h> |
19 | #include <linux/workqueue.h> | 19 | #include <linux/workqueue.h> |
20 | #include <linux/mfd/core.h> | ||
21 | #include <linux/mfd/88pm860x.h> | 20 | #include <linux/mfd/88pm860x.h> |
22 | 21 | ||
23 | #define LED_PWM_SHIFT (3) | 22 | #define LED_PWM_SHIFT (3) |
@@ -171,7 +170,6 @@ static int pm860x_led_probe(struct platform_device *pdev) | |||
171 | struct pm860x_chip *chip = dev_get_drvdata(pdev->dev.parent); | 170 | struct pm860x_chip *chip = dev_get_drvdata(pdev->dev.parent); |
172 | struct pm860x_led_pdata *pdata; | 171 | struct pm860x_led_pdata *pdata; |
173 | struct pm860x_led *data; | 172 | struct pm860x_led *data; |
174 | struct mfd_cell *cell; | ||
175 | struct resource *res; | 173 | struct resource *res; |
176 | int ret; | 174 | int ret; |
177 | 175 | ||
@@ -181,10 +179,7 @@ static int pm860x_led_probe(struct platform_device *pdev) | |||
181 | return -EINVAL; | 179 | return -EINVAL; |
182 | } | 180 | } |
183 | 181 | ||
184 | cell = pdev->dev.platform_data; | 182 | pdata = pdev->dev.platform_data; |
185 | if (cell == NULL) | ||
186 | return -ENODEV; | ||
187 | pdata = cell->mfd_data; | ||
188 | if (pdata == NULL) { | 183 | if (pdata == NULL) { |
189 | dev_err(&pdev->dev, "No platform data!\n"); | 184 | dev_err(&pdev->dev, "No platform data!\n"); |
190 | return -EINVAL; | 185 | return -EINVAL; |