3 files changed, 0 insertions, 49 deletions

diff --git a/drivers/video/omap/omapfb_main.c b/drivers/video/omap/omapfb_main.c
index aaf0990162cc..3d2e14798210 100644
--- a/drivers/video/omap/omapfb_main.c
+++ b/drivers/video/omap/omapfb_main.c
@@ -157,11 +157,6 @@ static int ctrl_init(struct omapfb_device *fbdev)
                         fbdev->mem_desc.region[i].size =
                                 PAGE_ALIGN(def_vram[i]);
                 fbdev->mem_desc.region_cnt = i;
-        } else {
-                struct omapfb_platform_data *conf;
-
-                conf = fbdev->dev->platform_data;
-                fbdev->mem_desc = conf->mem_desc;
         }
 
         if (!fbdev->mem_desc.region_cnt) {
diff --git a/drivers/video/omap2/omapfb/omapfb-main.c b/drivers/video/omap2/omapfb/omapfb-main.c
index 17e7320b48d5..4c28d57e34df 100644
--- a/drivers/video/omap2/omapfb/omapfb-main.c
+++ b/drivers/video/omap2/omapfb/omapfb-main.c
@@ -1614,23 +1614,6 @@ static int omapfb_allocate_all_fbs(struct omapfb2_device *fbdev)
                 memset(&vram_paddrs, 0, sizeof(vram_paddrs));
         }
 
-        if (fbdev->dev->platform_data) {
-                struct omapfb_platform_data *opd;
-                opd = fbdev->dev->platform_data;
-                for (i = 0; i < opd->mem_desc.region_cnt; ++i) {
-                        if (!vram_sizes[i]) {
-                                unsigned long size;
-                                unsigned long paddr;
-
-                                size = opd->mem_desc.region[i].size;
-                                paddr = opd->mem_desc.region[i].paddr;
-
-                                vram_sizes[i] = size;
-                                vram_paddrs[i] = paddr;
-                        }
-                }
-        }
-
         for (i = 0; i < fbdev->num_fbs; i++) {
                 /* allocate memory automatically only for fb0, or if
                  * excplicitly defined with vram or plat data option */
@@ -1828,32 +1811,6 @@ static int omapfb_fb_init(struct omapfb2_device *fbdev, struct fb_info *fbi)
 
         var->rotate = def_rotate;
 
-        /*
-         * Check if there is a default color format set in the board file,
-         * and use this format instead the default deducted from the
-         * display bpp.
-         */
-        if (fbdev->dev->platform_data) {
-                struct omapfb_platform_data *opd;
-                int id = ofbi->id;
-
-                opd = fbdev->dev->platform_data;
-                if (opd->mem_desc.region[id].format_used) {
-                        enum omap_color_mode mode;
-                        enum omapfb_color_format format;
-
-                        format = opd->mem_desc.region[id].format;
-                        mode = fb_format_to_dss_mode(format);
-                        if (mode < 0) {
-                                r = mode;
-                                goto err;
-                        }
-                        r = dss_mode_to_fb_mode(mode, var);
-                        if (r < 0)
-                                goto err;
-                }
-        }
-
         if (display) {
                 u16 w, h;
                 int rotation = (var->rotate + ofbi->rotation[0]) % 4;
diff --git a/include/linux/omapfb.h b/include/linux/omapfb.h
index 7ab9cebf9164..03f52555ce63 100644
--- a/include/linux/omapfb.h
+++ b/include/linux/omapfb.h
@@ -249,7 +249,6 @@ struct omapfb_mem_desc {
 
 struct omapfb_platform_data {
         struct omap_lcd_config          lcd;
-        struct omapfb_mem_desc          mem_desc;
 };
 
 /* in arch/arm/plat-omap/fb.c */