video: Drop references to CONFIG_VIDEO et al

[platform/kernel/u-boot.git] / drivers / video / nexell_display.c

diff --git a/drivers/video/nexell_display.c b/drivers/video/nexell_display.c
index b47bef3..090fd6e 100644 (file)
--- a/drivers/video/nexell_display.c
+++ b/drivers/video/nexell_display.c
@@ -15,8 +15,7 @@
 #include <malloc.h>
 #include <linux/compat.h>
 #include <linux/err.h>
-#include <video.h>             /* For struct video_uc_platdata */
-#include <video_fb.h>
+#include <video.h>             /* For struct video_uc_plat */
 #include <lcd.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
@@ -537,7 +536,6 @@ static int nx_display_probe(struct udevice *dev)
        struct video_uc_plat *uc_plat = dev_get_uclass_plat(dev);
        struct video_priv *uc_priv = dev_get_uclass_priv(dev);
        struct nx_display_plat *plat = dev_get_plat(dev);
-       static GraphicDevice *graphic_device;
        char addr[64];
 
        debug("%s()\n", __func__);
@@ -564,7 +562,6 @@ static int nx_display_probe(struct udevice *dev)
        }
 
        struct nx_display_dev *dp;
-       unsigned int pp_index = 0;
 
        dp = nx_display_setup();
        if (!dp) {
@@ -575,7 +572,6 @@ static int nx_display_probe(struct udevice *dev)
 
        switch (dp->depth) {
        case 2:
-               pp_index = GDF_16BIT_565RGB;
                uc_priv->bpix = VIDEO_BPP16;
                break;
        case 3:
@@ -583,7 +579,6 @@ static int nx_display_probe(struct udevice *dev)
                 * type video_log2_bpp
                 */
        case 4:
-               pp_index = GDF_32BIT_X888RGB;
                uc_priv->bpix = VIDEO_BPP32;
                break;
        default:
@@ -596,19 +591,9 @@ static int nx_display_probe(struct udevice *dev)
        uc_priv->ysize = dp->fb_plane->height;
        uc_priv->rot = 0;
 
-       graphic_device = &dp->graphic_device;
-       graphic_device->frameAdrs = dp->fb_addr;
-       graphic_device->gdfIndex = pp_index;
-       graphic_device->gdfBytesPP = dp->depth;
-       graphic_device->winSizeX = dp->fb_plane->width;
-       graphic_device->winSizeY = dp->fb_plane->height;
-       graphic_device->plnSizeX =
-           graphic_device->winSizeX * graphic_device->gdfBytesPP;
-
        /*
         * set environment variable "fb_addr" (frame buffer address), required
-        * for splash image. Because drv_video_init() in common/stdio.c is only
-        * called when CONFIG_VIDEO is set (and not if CONFIG_DM_VIDEO is set).
+        * for splash image, which is not set if CONFIG_DM_VIDEO is enabled).
         */
        sprintf(addr, "0x%x", dp->fb_addr);
        debug("%s(): env_set(\"fb_addr\", %s) ...\n", __func__, addr);