aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video
diff options
context:
space:
mode:
authorAndres Salomon <dilinger@queued.net>2011-03-01 15:32:20 -0500
committerSamuel Ortiz <sameo@linux.intel.com>2011-03-23 05:42:01 -0400
commit944dc03551f6e812c00e586edba84b28c52ffe8c (patch)
tree18bbcdc2c9ccc6a05d217503e28a77efea662b63 /drivers/video
parent93619c2106e2c968a260ebffb75ddc5efa567c16 (diff)
tmio: Silence warnings introduced by mfd changes
This silences warnings such as drivers/video/tmiofb.c: In function 'tmiofb_hw_init': drivers/video/tmiofb.c:270: warning: initialization discards qualifiers from pointer target type These were added by me in commit 2a79bb1d. Signed-off-by: Andres Salomon <dilinger@queued.net> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers/video')
-rw-r--r--drivers/video/tmiofb.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/video/tmiofb.c b/drivers/video/tmiofb.c
index 7e57d3baab23..9710bf8caeae 100644
--- a/drivers/video/tmiofb.c
+++ b/drivers/video/tmiofb.c
@@ -267,7 +267,7 @@ static int tmiofb_hw_stop(struct platform_device *dev)
267 */ 267 */
268static int tmiofb_hw_init(struct platform_device *dev) 268static int tmiofb_hw_init(struct platform_device *dev)
269{ 269{
270 struct mfd_cell *cell = mfd_get_cell(dev); 270 const struct mfd_cell *cell = mfd_get_cell(dev);
271 struct fb_info *info = platform_get_drvdata(dev); 271 struct fb_info *info = platform_get_drvdata(dev);
272 struct tmiofb_par *par = info->par; 272 struct tmiofb_par *par = info->par;
273 const struct resource *nlcr = &cell->resources[0]; 273 const struct resource *nlcr = &cell->resources[0];
@@ -311,7 +311,6 @@ static int tmiofb_hw_init(struct platform_device *dev)
311 */ 311 */
312static void tmiofb_hw_mode(struct platform_device *dev) 312static void tmiofb_hw_mode(struct platform_device *dev)
313{ 313{
314 struct mfd_cell *cell = mfd_get_cell(dev);
315 struct tmio_fb_data *data = mfd_get_data(dev); 314 struct tmio_fb_data *data = mfd_get_data(dev);
316 struct fb_info *info = platform_get_drvdata(dev); 315 struct fb_info *info = platform_get_drvdata(dev);
317 struct fb_videomode *mode = info->mode; 316 struct fb_videomode *mode = info->mode;
@@ -680,7 +679,7 @@ static struct fb_ops tmiofb_ops = {
680 679
681static int __devinit tmiofb_probe(struct platform_device *dev) 680static int __devinit tmiofb_probe(struct platform_device *dev)
682{ 681{
683 struct mfd_cell *cell = mfd_get_cell(dev); 682 const struct mfd_cell *cell = mfd_get_cell(dev);
684 struct tmio_fb_data *data = mfd_get_data(dev); 683 struct tmio_fb_data *data = mfd_get_data(dev);
685 struct resource *ccr = platform_get_resource(dev, IORESOURCE_MEM, 1); 684 struct resource *ccr = platform_get_resource(dev, IORESOURCE_MEM, 1);
686 struct resource *lcr = platform_get_resource(dev, IORESOURCE_MEM, 0); 685 struct resource *lcr = platform_get_resource(dev, IORESOURCE_MEM, 0);
@@ -808,7 +807,7 @@ err_ioremap_ccr:
808 807
809static int __devexit tmiofb_remove(struct platform_device *dev) 808static int __devexit tmiofb_remove(struct platform_device *dev)
810{ 809{
811 struct mfd_cell *cell = mfd_get_cell(dev); 810 const struct mfd_cell *cell = mfd_get_cell(dev);
812 struct fb_info *info = platform_get_drvdata(dev); 811 struct fb_info *info = platform_get_drvdata(dev);
813 int irq = platform_get_irq(dev, 0); 812 int irq = platform_get_irq(dev, 0);
814 struct tmiofb_par *par; 813 struct tmiofb_par *par;
@@ -938,7 +937,7 @@ static int tmiofb_suspend(struct platform_device *dev, pm_message_t state)
938#ifdef CONFIG_FB_TMIO_ACCELL 937#ifdef CONFIG_FB_TMIO_ACCELL
939 struct tmiofb_par *par = info->par; 938 struct tmiofb_par *par = info->par;
940#endif 939#endif
941 struct mfd_cell *cell = mfd_get_cell(dev); 940 const struct mfd_cell *cell = mfd_get_cell(dev);
942 int retval = 0; 941 int retval = 0;
943 942
944 console_lock(); 943 console_lock();
@@ -970,7 +969,7 @@ static int tmiofb_suspend(struct platform_device *dev, pm_message_t state)
970static int tmiofb_resume(struct platform_device *dev) 969static int tmiofb_resume(struct platform_device *dev)
971{ 970{
972 struct fb_info *info = platform_get_drvdata(dev); 971 struct fb_info *info = platform_get_drvdata(dev);
973 struct mfd_cell *cell = mfd_get_cell(dev); 972 const struct mfd_cell *cell = mfd_get_cell(dev);
974 int retval = 0; 973 int retval = 0;
975 974
976 console_lock(); 975 console_lock();