Merge branch 'master' of git://git.denx.de/u-boot-arm

[karo-tx-uboot.git] / drivers / video / videomodes.c

diff --git a/drivers/video/videomodes.c b/drivers/video/videomodes.c
index 6fe5811aec92ba4aa377f92f6c56aee2e8b8ffe8..18c1f3d8acc0e90d27a90a3460bb2758827a3f58 100644 (file)
--- a/drivers/video/videomodes.c
+++ b/drivers/video/videomodes.c
@@ -3,23 +3,7 @@
  * Pierre Aubert, Staubli Faverges , <p.aubert@staubli.com>
  * Copyright 2011 Freescale Semiconductor, Inc.
  *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.         See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
+ * SPDX-License-Identifier:    GPL-2.0+
  */
 
 /************************************************************************
@@ -159,15 +143,18 @@ video_search_param (char *start, char *param)
 int video_get_params (struct ctfb_res_modes *pPar, char *penv)
 {
        char *p, *s, *val_s;
-       int i = 0, t;
+       int i = 0;
        int bpp;
        int mode;
+
        /* first search for the environment containing the real param string */
        s = penv;
-       if ((p = getenv (s)) != NULL) {
+
+       if ((p = getenv (s)) != NULL)
                s = p;
-       }
-       /* in case of the bootargs line, we have to start
+
+       /*
+        * in case of the bootargs line, we have to start
         * after "video=ctfb:"
         */
        i = video_search_param (s, "video=ctfb:");
@@ -177,19 +164,22 @@ int video_get_params (struct ctfb_res_modes *pPar, char *penv)
        }
        /* search for mode as a default value */
        p = s;
-       t = 0;
        mode = 0;               /* default */
+
        while ((i = video_get_param_len (p, ',')) != 0) {
                GET_OPTION ("mode:", mode)
                        p += i;
                if (*p != 0)
                        p++;    /* skip ',' */
        }
+
        if (mode >= RES_MODES_COUNT)
                mode = 0;
+
        *pPar = res_mode_init[mode];    /* copy default values */
        bpp = 24 - ((mode % 3) * 8);
        p = s;                  /* restart */
+
        while ((i = video_get_param_len (p, ',')) != 0) {
                GET_OPTION ("x:", pPar->xres)
                        GET_OPTION ("y:", pPar->yres)