Message ID | 21370.1326683320@neuling.org (mailing list archive) |
---|---|
State | Not Applicable |
Headers | show |
Michael Neuling wrote: > drivers/video/fsl-diu-fb.c: In function 'fsl_diu_suspend': > drivers/video/fsl-diu-fb.c:1435: error: incompatible type for argument 1 of 'disable_lcdc' > drivers/video/fsl-diu-fb.c:592: note: expected 'struct fb_info *' but argument is of type 'struct fb_info' > drivers/video/fsl-diu-fb.c: In function 'fsl_diu_resume': > drivers/video/fsl-diu-fb.c:1445: error: incompatible type for argument 1 of 'enable_lcdc' > drivers/video/fsl-diu-fb.c:583: note: expected 'struct fb_info *' but argument is of type 'struct fb_info' I figured out what the problem is. I never compiled a configuration with CONFIG_PM enabled. For some reason, CONFIG_PM is disabled when SMP is enabled, and I only tested with mpc85xx_smp_defconfig.
Michael Neuling wrote: > From: Michael Neuling <mikey@neuling.org> > > [PATCH] drivers/video: compile fixes for fsl-diu-fb.c > > Fix a compiler errors introduced in: > commit ddd3d905436b572ebadc09dcf2d12ca5b37020a0 > Author: Timur Tabi <timur@freescale.com> > drivers/video: fsl-diu-fb: merge all allocated data into one block > > Signed-off-by: Michael Neuling <mikey@neuling.org> Acked-by: Timur Tabi <timur@freescale.com>
On 01/16/2012 03:08 AM, Michael Neuling wrote: [...] > From: Michael Neuling <mikey@neuling.org> > > [PATCH] drivers/video: compile fixes for fsl-diu-fb.c > > Fix a compiler errors introduced in: > commit ddd3d905436b572ebadc09dcf2d12ca5b37020a0 > Author: Timur Tabi <timur@freescale.com> > drivers/video: fsl-diu-fb: merge all allocated data into one block > > Signed-off-by: Michael Neuling <mikey@neuling.org> Applied. Thanks, Florian Tobias Schandinat > > diff --git a/drivers/video/fsl-diu-fb.c b/drivers/video/fsl-diu-fb.c > index acf292b..6af3f16 100644 > --- a/drivers/video/fsl-diu-fb.c > +++ b/drivers/video/fsl-diu-fb.c > @@ -1432,7 +1432,7 @@ static int fsl_diu_suspend(struct platform_device *ofdev, pm_message_t state) > struct fsl_diu_data *data; > > data = dev_get_drvdata(&ofdev->dev); > - disable_lcdc(data->fsl_diu_info[0]); > + disable_lcdc(data->fsl_diu_info); > > return 0; > } > @@ -1442,7 +1442,7 @@ static int fsl_diu_resume(struct platform_device *ofdev) > struct fsl_diu_data *data; > > data = dev_get_drvdata(&ofdev->dev); > - enable_lcdc(data->fsl_diu_info[0]); > + enable_lcdc(data->fsl_diu_info); > > return 0; > } >
In message <4F26274B.2040401@gmx.de> you wrote: > On 01/16/2012 03:08 AM, Michael Neuling wrote: > [...] > > From: Michael Neuling <mikey@neuling.org> > > > > [PATCH] drivers/video: compile fixes for fsl-diu-fb.c > > > > Fix a compiler errors introduced in: > > commit ddd3d905436b572ebadc09dcf2d12ca5b37020a0 > > Author: Timur Tabi <timur@freescale.com> > > drivers/video: fsl-diu-fb: merge all allocated data into one block > > > > Signed-off-by: Michael Neuling <mikey@neuling.org> > > Applied. Florian, I've not seen this appear in mainline as yet. When do you expect to send a pull request? Mikey
diff --git a/drivers/video/fsl-diu-fb.c b/drivers/video/fsl-diu-fb.c index acf292b..6af3f16 100644 --- a/drivers/video/fsl-diu-fb.c +++ b/drivers/video/fsl-diu-fb.c @@ -1432,7 +1432,7 @@ static int fsl_diu_suspend(struct platform_device *ofdev, pm_message_t state) struct fsl_diu_data *data; data = dev_get_drvdata(&ofdev->dev); - disable_lcdc(data->fsl_diu_info[0]); + disable_lcdc(data->fsl_diu_info); return 0; } @@ -1442,7 +1442,7 @@ static int fsl_diu_resume(struct platform_device *ofdev) struct fsl_diu_data *data; data = dev_get_drvdata(&ofdev->dev); - enable_lcdc(data->fsl_diu_info[0]); + enable_lcdc(data->fsl_diu_info); return 0; }