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

[u-boot] / drivers / gpio / pca953x.c

diff --git a/drivers/gpio/pca953x.c b/drivers/gpio/pca953x.c
index c8c863765b6db72b86c2e6c468c518c3168b259f..fda8054d530872d32816639b98794396d9787797 100644 (file)
--- a/drivers/gpio/pca953x.c
+++ b/drivers/gpio/pca953x.c
@@ -1,19 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright 2008 Extreme Engineering Solutions, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * Version 2 as published by the Free Software Foundation.
- *
- * 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
  */
 
 /*
@@ -154,8 +141,7 @@ int pca953x_get_val(uint8_t chip)
        return (int)val;
 }
 
-#ifdef CONFIG_CMD_PCA953X
-#ifdef CONFIG_CMD_PCA953X_INFO
+#if defined(CONFIG_CMD_PCA953X) && !defined(CONFIG_SPL_BUILD)
 /*
  * Display pca953x information
  */
@@ -205,19 +191,16 @@ static int pca953x_info(uint8_t chip)
 
        return 0;
 }
-#endif /* CONFIG_CMD_PCA953X_INFO */
 
-cmd_tbl_t cmd_pca953x[] = {
+static cmd_tbl_t cmd_pca953x[] = {
        U_BOOT_CMD_MKENT(device, 3, 0, (void *)PCA953X_CMD_DEVICE, "", ""),
        U_BOOT_CMD_MKENT(output, 4, 0, (void *)PCA953X_CMD_OUTPUT, "", ""),
        U_BOOT_CMD_MKENT(input, 3, 0, (void *)PCA953X_CMD_INPUT, "", ""),
        U_BOOT_CMD_MKENT(invert, 4, 0, (void *)PCA953X_CMD_INVERT, "", ""),
-#ifdef CONFIG_CMD_PCA953X_INFO
        U_BOOT_CMD_MKENT(info, 2, 0, (void *)PCA953X_CMD_INFO, "", ""),
-#endif
 };
 
-int do_pca953x(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+static int do_pca953x(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
        static uint8_t chip = CONFIG_SYS_I2C_PCA953X_ADDR;
        int ret = CMD_RET_USAGE, val;
@@ -229,7 +212,7 @@ int do_pca953x(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 
        /* All commands but "device" require 'maxargs' arguments */
        if (!c || !((argc == (c->maxargs)) ||
-               (((int)c->cmd == PCA953X_CMD_DEVICE) &&
+               (((long)c->cmd == PCA953X_CMD_DEVICE) &&
                 (argc == (c->maxargs - 1))))) {
                return CMD_RET_USAGE;
        }
@@ -242,14 +225,12 @@ int do_pca953x(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
        if (argc > 3)
                ul_arg3 = simple_strtoul(argv[3], NULL, 16) & 0x1;
 
-       switch ((int)c->cmd) {
-#ifdef CONFIG_CMD_PCA953X_INFO
+       switch ((long)c->cmd) {
        case PCA953X_CMD_INFO:
                ret = pca953x_info(chip);
                if (ret)
                        ret = CMD_RET_FAILURE;
                break;
-#endif
 
        case PCA953X_CMD_DEVICE:
                if (argc == 3)
@@ -299,10 +280,8 @@ U_BOOT_CMD(
        "pca953x gpio access",
        "device [dev]\n"
        "       - show or set current device address\n"
-#ifdef CONFIG_CMD_PCA953X_INFO
        "pca953x info\n"
        "       - display info for current chip\n"
-#endif
        "pca953x output pin 0|1\n"
        "       - set pin as output and drive low or high\n"
        "pca953x invert pin 0|1\n"