aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video
diff options
context:
space:
mode:
authorSamuel Ortiz <sameo@linux.intel.com>2011-04-06 10:26:56 -0400
committerSamuel Ortiz <sameo@linux.intel.com>2011-05-26 13:45:12 -0400
commit07259a7092e47b9fbb5c8bfdad45fa4c7dbbc051 (patch)
tree73d3c059141e3b418ac40b3f63a165fc1b326013 /drivers/video
parenta7c98ce25cfa600bd614134a82d22bcb7bcb9d65 (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/video')
-rw-r--r--drivers/video/backlight/88pm860x_bl.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/video/backlight/88pm860x_bl.c b/drivers/video/backlight/88pm860x_bl.c
index c8b520e9a11a..c04b94da81f7 100644
--- a/drivers/video/backlight/88pm860x_bl.c
+++ b/drivers/video/backlight/88pm860x_bl.c
@@ -16,7 +16,6 @@
16#include <linux/fb.h> 16#include <linux/fb.h>
17#include <linux/i2c.h> 17#include <linux/i2c.h>
18#include <linux/backlight.h> 18#include <linux/backlight.h>
19#include <linux/mfd/core.h>
20#include <linux/mfd/88pm860x.h> 19#include <linux/mfd/88pm860x.h>
21 20
22#define MAX_BRIGHTNESS (0xFF) 21#define MAX_BRIGHTNESS (0xFF)
@@ -168,7 +167,6 @@ static int pm860x_backlight_probe(struct platform_device *pdev)
168 struct pm860x_backlight_pdata *pdata = NULL; 167 struct pm860x_backlight_pdata *pdata = NULL;
169 struct pm860x_backlight_data *data; 168 struct pm860x_backlight_data *data;
170 struct backlight_device *bl; 169 struct backlight_device *bl;
171 struct mfd_cell *cell;
172 struct resource *res; 170 struct resource *res;
173 struct backlight_properties props; 171 struct backlight_properties props;
174 unsigned char value; 172 unsigned char value;
@@ -181,10 +179,7 @@ static int pm860x_backlight_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, "platform data isn't assigned to " 184 dev_err(&pdev->dev, "platform data isn't assigned to "
190 "backlight\n"); 185 "backlight\n");