Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-29 06:12:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

fb: Use mfd_data instead of driver_data for tmio-fb

Browse Source 
Use mfd_data for passing information from mfd drivers to mfd
clients.  The mfd_cell's driver_data field is being phased out.

Clients that were using driver_data now access .mfd_data
via mfd_get_data().  This changes tmio-fb only; mfd drivers with
other cells are not modified.

Signed-off-by: Andres Salomon <dilinger@queued.net>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
This commit is contained in:
Andres Salomon 2011-02-17 19:07:31 -08:00 committed by Samuel Ortiz
parent d9d01f4b26
commit 6d90bdde4b
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/mfd/tc6393xb.c
View File

@ -694,7 +694,7 @@ static int __devinit tc6393xb_probe(struct platform_device *dev)
} }
tc6393xb_cells[TC6393XB_CELL_NAND].mfd_data = tcpd->nand_data; tc6393xb_cells[TC6393XB_CELL_NAND].mfd_data = tcpd->nand_data;
tc6393xb_cells[TC6393XB_CELL_FB].driver_data = tcpd->fb_data; tc6393xb_cells[TC6393XB_CELL_FB].mfd_data = tcpd->fb_data;
ret = mfd_add_devices(&dev->dev, dev->id, ret = mfd_add_devices(&dev->dev, dev->id,
tc6393xb_cells, ARRAY_SIZE(tc6393xb_cells), tc6393xb_cells, ARRAY_SIZE(tc6393xb_cells),

15
drivers/video/tmiofb.c
View File

@ -250,8 +250,7 @@ static irqreturn_t tmiofb_irq(int irq, void *__info)
*/ */
static int tmiofb_hw_stop(struct platform_device *dev) static int tmiofb_hw_stop(struct platform_device *dev)
{ {
struct mfd_cell *cell = mfd_get_cell(dev); struct tmio_fb_data *data = mfd_get_data(dev);
struct tmio_fb_data *data = cell->driver_data;
struct fb_info *info = platform_get_drvdata(dev); struct fb_info *info = platform_get_drvdata(dev);
struct tmiofb_par *par = info->par; struct tmiofb_par *par = info->par;
@ -313,7 +312,7 @@ static int tmiofb_hw_init(struct platform_device *dev)
static void tmiofb_hw_mode(struct platform_device *dev) static void tmiofb_hw_mode(struct platform_device *dev)
{ {
struct mfd_cell *cell = mfd_get_cell(dev); struct mfd_cell *cell = mfd_get_cell(dev);
struct tmio_fb_data *data = cell->driver_data; struct tmio_fb_data *data = mfd_get_data(dev);
struct fb_info *info = platform_get_drvdata(dev); struct fb_info *info = platform_get_drvdata(dev);
struct fb_videomode *mode = info->mode; struct fb_videomode *mode = info->mode;
struct tmiofb_par *par = info->par; struct tmiofb_par *par = info->par;
@ -559,8 +558,8 @@ static int tmiofb_ioctl(struct fb_info *fbi,
static struct fb_videomode * static struct fb_videomode *
tmiofb_find_mode(struct fb_info *info, struct fb_var_screeninfo *var) tmiofb_find_mode(struct fb_info *info, struct fb_var_screeninfo *var)
{ {
struct mfd_cell *cell = mfd_get_cell(to_platform_device(info->device)); struct tmio_fb_data *data =
struct tmio_fb_data *data = cell->driver_data; mfd_get_data(to_platform_device(info->device));
struct fb_videomode *best = NULL; struct fb_videomode *best = NULL;
int i; int i;
@ -580,8 +579,8 @@ static int tmiofb_check_var(struct fb_var_screeninfo *var, struct fb_info *info)
{ {
struct fb_videomode *mode; struct fb_videomode *mode;
struct mfd_cell *cell = mfd_get_cell(to_platform_device(info->device)); struct tmio_fb_data *data =
struct tmio_fb_data *data = cell->driver_data; mfd_get_data(to_platform_device(info->device));
mode = tmiofb_find_mode(info, var); mode = tmiofb_find_mode(info, var);
if (!mode || var->bits_per_pixel > 16) if (!mode || var->bits_per_pixel > 16)
@ -682,7 +681,7 @@ static struct fb_ops tmiofb_ops = {
static int __devinit tmiofb_probe(struct platform_device *dev) static int __devinit tmiofb_probe(struct platform_device *dev)
{ {
struct mfd_cell *cell = mfd_get_cell(dev); struct mfd_cell *cell = mfd_get_cell(dev);
struct tmio_fb_data *data = cell->driver_data; struct tmio_fb_data *data = mfd_get_data(dev);
struct resource *ccr = platform_get_resource(dev, IORESOURCE_MEM, 1); struct resource *ccr = platform_get_resource(dev, IORESOURCE_MEM, 1);
struct resource *lcr = platform_get_resource(dev, IORESOURCE_MEM, 0); struct resource *lcr = platform_get_resource(dev, IORESOURCE_MEM, 0);
struct resource *vram = platform_get_resource(dev, IORESOURCE_MEM, 2); struct resource *vram = platform_get_resource(dev, IORESOURCE_MEM, 2);