openocd: use single line for register_commands*()

[openocd.git] / src / pld / pld.c

diff --git a/src/pld/pld.c b/src/pld/pld.c
index a9431f44d54d44b0922e32fd48ad07349d1529ef..fe21f6c85b816a9cb274c2405356b55af0beb1c7 100644 (file)
--- a/src/pld/pld.c
+++ b/src/pld/pld.c
@@ -13,9 +13,7 @@
  *   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.             *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  ***************************************************************************/
 
 #ifdef HAVE_CONFIG_H
@@ -24,6 +22,7 @@
 
 #include "pld.h"
 #include <helper/log.h>
+#include <helper/replacements.h>
 #include <helper/time_support.h>
 
 
@@ -68,9 +67,8 @@ COMMAND_HANDLER(handle_pld_device_command)
                        /* register pld specific commands */
                        int retval;
                        if (pld_drivers[i]->commands) {
-                               retval = register_commands(CMD_CTX, NULL,
-                                               pld_drivers[i]->commands);
-                               if (ERROR_OK != retval) {
+                               retval = register_commands(CMD_CTX, NULL, pld_drivers[i]->commands);
+                               if (retval != ERROR_OK) {
                                        LOG_ERROR("couldn't register '%s' commands", CMD_ARGV[0]);
                                        return ERROR_FAIL;
                                }
@@ -82,7 +80,7 @@ COMMAND_HANDLER(handle_pld_device_command)
 
                        retval = CALL_COMMAND_HANDLER(
                                        pld_drivers[i]->pld_device_command, c);
-                       if (ERROR_OK != retval) {
+                       if (retval != ERROR_OK) {
                                LOG_ERROR("'%s' driver rejected pld device",
                                        CMD_ARGV[0]);
                                free(c);
@@ -118,12 +116,12 @@ COMMAND_HANDLER(handle_pld_devices_command)
        int i = 0;
 
        if (!pld_devices) {
-               command_print(CMD_CTX, "no pld devices configured");
+               command_print(CMD, "no pld devices configured");
                return ERROR_OK;
        }
 
        for (p = pld_devices; p; p = p->next)
-               command_print(CMD_CTX, "#%i: %s", i++, p->driver->name);
+               command_print(CMD, "#%i: %s", i++, p->driver->name);
 
        return ERROR_OK;
 }
@@ -143,13 +141,13 @@ COMMAND_HANDLER(handle_pld_load_command)
        COMMAND_PARSE_NUMBER(uint, CMD_ARGV[0], dev_id);
        p = get_pld_device_by_num(dev_id);
        if (!p) {
-               command_print(CMD_CTX, "pld device '#%s' is out of bounds", CMD_ARGV[0]);
+               command_print(CMD, "pld device '#%s' is out of bounds", CMD_ARGV[0]);
                return ERROR_OK;
        }
 
        retval = p->driver->load(p, CMD_ARGV[1]);
        if (retval != ERROR_OK) {
-               command_print(CMD_CTX, "failed loading file %s to pld device %u",
+               command_print(CMD, "failed loading file %s to pld device %u",
                        CMD_ARGV[1], dev_id);
                switch (retval) {
                }
@@ -158,7 +156,7 @@ COMMAND_HANDLER(handle_pld_load_command)
                gettimeofday(&end, NULL);
                timeval_subtract(&duration, &end, &start);
 
-               command_print(CMD_CTX, "loaded file %s to pld device %u in %jis %jius",
+               command_print(CMD, "loaded file %s to pld device %u in %jis %jius",
                        CMD_ARGV[1], dev_id,
                        (intmax_t)duration.tv_sec, (intmax_t)duration.tv_usec);
        }
@@ -172,6 +170,7 @@ static const struct command_registration pld_exec_command_handlers[] = {
                .handler = handle_pld_devices_command,
                .mode = COMMAND_EXEC,
                .help = "list configured pld devices",
+               .usage = "",
        },
        {
                .name = "load",
@@ -188,8 +187,7 @@ static int pld_init(struct command_context *cmd_ctx)
        if (!pld_devices)
                return ERROR_OK;
 
-       struct command *parent = command_find_in_context(cmd_ctx, "pld");
-       return register_commands(cmd_ctx, parent, pld_exec_command_handlers);
+       return register_commands(cmd_ctx, "pld", pld_exec_command_handlers);
 }
 
 COMMAND_HANDLER(handle_pld_init_command)