commands: remove struct command pointer from commands

This is unused in all commands and thus can be removed.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

arch/arm/boards/eukrea_cpuimx35/eukrea_cpuimx35.c

@@ -333,7 +333,7 @@ core_initcall(eukrea_cpuimx35_core_init);
 #define MPCTL_PARAM_399     (IMX_PLL_PD(0) | IMX_PLL_MFD(15) | IMX_PLL_MFI(8) | IMX_PLL_MFN(5))
 #define MPCTL_PARAM_532     ((1 << 31) | IMX_PLL_PD(0) | IMX_PLL_MFD(11) | IMX_PLL_MFI(11) | IMX_PLL_MFN(1))
 
-static int do_cpufreq(struct command *cmdtp, int argc, char *argv[])
+static int do_cpufreq(int argc, char *argv[])
 {
 	unsigned long freq;
 

arch/arm/boards/guf-cupid/board.c

@@ -332,7 +332,7 @@ core_initcall(cupid_core_setup);
 #define MPCTL_PARAM_399     (IMX_PLL_PD(0) | IMX_PLL_MFD(15) | IMX_PLL_MFI(8) | IMX_PLL_MFN(5))
 #define MPCTL_PARAM_532     ((1 << 31) | IMX_PLL_PD(0) | IMX_PLL_MFD(11) | IMX_PLL_MFI(11) | IMX_PLL_MFN(1))
 
-static int do_cpufreq(struct command *cmdtp, int argc, char *argv[])
+static int do_cpufreq(int argc, char *argv[])
 {
 	unsigned long freq;
 

arch/arm/boards/pcm043/pcm043.c

@@ -302,7 +302,7 @@ core_initcall(pcm043_core_setup);
 #define MPCTL_PARAM_399     (IMX_PLL_PD(0) | IMX_PLL_MFD(15) | IMX_PLL_MFI(8) | IMX_PLL_MFN(5))
 #define MPCTL_PARAM_532     ((1 << 31) | IMX_PLL_PD(0) | IMX_PLL_MFD(11) | IMX_PLL_MFI(11) | IMX_PLL_MFN(1))
 
-static int do_cpufreq(struct command *cmdtp, int argc, char *argv[])
+static int do_cpufreq(int argc, char *argv[])
 {
 	unsigned long freq;
 

arch/arm/cpu/cpuinfo.c

@@ -50,7 +50,7 @@ static char *crbits[] = {"M", "A", "C", "W", "P", "D", "L", "B", "S", "R",
 	"F", "Z", "I", "V", "RR", "L4", "DT", "", "IT", "ST", "", "FI", "U", "XP",
 	"VE", "EE", "L2", "", "TRE", "AFE", "TE"};
 
-static int do_cpuinfo(struct command *cmdtp, int argc, char *argv[])
+static int do_cpuinfo(int argc, char *argv[])
 {
 	unsigned long mainid, cache, cr;
 	char *architecture, *implementer;

arch/arm/lib/bootu.c

@@ -6,7 +6,7 @@
 #include <of.h>
 #include <asm/armlinux.h>
 
-static int do_bootu(struct command *cmdtp, int argc, char *argv[])
+static int do_bootu(int argc, char *argv[])
 {
 	int fd;
 	void *kernel = NULL;

arch/arm/lib/bootz.c

@@ -21,7 +21,7 @@ struct zimage_header {
 
 #define ZIMAGE_MAGIC 0x016F2818
 
-static int do_bootz(struct command *cmdtp, int argc, char *argv[])
+static int do_bootz(int argc, char *argv[])
 {
 	int fd, ret, swap = 0;
 	struct zimage_header __header, *header;

arch/arm/mach-imx/clko.c

@@ -4,7 +4,7 @@
 #include <mach/imx-regs.h>
 #include <mach/clock.h>
 
-static int do_clko(struct command *cmdtp, int argc, char *argv[])
+static int do_clko(int argc, char *argv[])
 {
 	int opt, div = 0, src = -2, ret;
 

arch/arm/mach-imx/internal-nand-boot.c

@@ -240,7 +240,7 @@ void __bare_init imx_nand_load_image(void *dest, int size)
 #ifdef CONFIG_NAND_IMX_BOOT_DEBUG
 #include <command.h>
 
-static int do_nand_boot_test(struct command *cmdtp, int argc, char *argv[])
+static int do_nand_boot_test(int argc, char *argv[])
 {
 	void *dest;
 	int size;

arch/arm/mach-imx/speed.c

@@ -70,7 +70,7 @@ unsigned int imx_decode_pll(unsigned int reg_val, unsigned int freq)
 
 extern void imx_dump_clocks(void);
 
-static int do_clocks(struct command *cmdtp, int argc, char *argv[])
+static int do_clocks(int argc, char *argv[])
 {
 	imx_dump_clocks();
 

arch/arm/mach-mxs/imx.c

@@ -22,7 +22,7 @@
 
 extern void imx_dump_clocks(void);
 
-static int do_clocks(struct command *cmdtp, int argc, char *argv[])
+static int do_clocks(int argc, char *argv[])
 {
 	imx_dump_clocks();
 

arch/arm/mach-netx/generic.c

@@ -116,7 +116,7 @@ int loadxc(int xcno) {
 	return 0;
 }
 
-int do_loadxc(struct command *cmdtp, int argc, char *argv[])
+int do_loadxc(int argc, char *argv[])
 {
 	int xcno;
 

arch/blackfin/boards/ipe337/cmd_alternate.c

@@ -6,7 +6,7 @@
 
 #define MAGIC		0x19691228
 
-static int do_alternate(struct command *cmdtp, int argc, char *argv[])
+static int do_alternate(int argc, char *argv[])
 {
 	void *buf;
 	size_t size;

arch/mips/lib/cpuinfo.c

@@ -24,7 +24,7 @@
 #include <command.h>
 #include <asm/mipsregs.h>
 
-static int do_cpuinfo(struct command *cmdtp, int argc, char *argv[])
+static int do_cpuinfo(int argc, char *argv[])
 {
 	printf("CP0_PRID = 0x%08x\n", read_c0_prid());
 	printf("CP0_CONFIG = 0x%08x\n", read_c0_config());

arch/openrisc/lib/cpuinfo.c

@@ -144,7 +144,7 @@ int checkcpu(void)
 	return 0;
 }
 
-static int do_cpuinfo(struct command *cmdtp, int argc, char *argv[])
+static int do_cpuinfo(int argc, char *argv[])
 {
 	checkcpu();
 	return 0;

commands/bmp.c

@@ -30,7 +30,7 @@ static inline void set_pixel(struct fb_info *info, void *adr, int r, int g, int
 	}
 }
 
-static int do_bmp(struct command *cmdtp, int argc, char *argv[])
+static int do_bmp(int argc, char *argv[])
 {
 	int ret, opt, fd;
 	char *fbdev = "/dev/fb0";

commands/bootm.c

@@ -252,7 +252,7 @@ static void bootm_image_name_and_no(char *name, int *no)
 	*no = simple_strtoul(at, NULL, 10);
 }
 
-static int do_bootm(struct command *cmdtp, int argc, char *argv[])
+static int do_bootm(int argc, char *argv[])
 {
 	int opt;
 	struct image_handler *handler;

commands/cat.c

@@ -35,11 +35,10 @@
 #define BUFSIZE 1024
 
 /**
- * @param[in] cmdtp FIXME
  * @param[in] argc Argument count from command line
  * @param[in] argv List of input arguments
  */
-static int do_cat(struct command *cmdtp, int argc, char *argv[])
+static int do_cat(int argc, char *argv[])
 {
 	int ret;
 	int fd, i;

commands/cd.c

@@ -30,7 +30,7 @@
 #include <fs.h>
 #include <errno.h>
 
-static int do_cd(struct command *cmdtp, int argc, char *argv[])
+static int do_cd(int argc, char *argv[])
 {
 	int ret;
 

commands/clear.c

@@ -24,7 +24,7 @@
 #include <command.h>
 #include <readkey.h>
 
-static int do_clear(struct command *cmdtp, int argc, char *argv[])
+static int do_clear(int argc, char *argv[])
 {
 	printf(ANSI_CLEAR_SCREEN);
 

commands/cp.c

@@ -35,11 +35,10 @@
 #include <getopt.h>
 
 /**
- * @param[in] cmdtp FIXME
  * @param[in] argc Argument count from command line
  * @param[in] argv List of input arguments
  */
-static int do_cp(struct command *cmdtp, int argc, char *argv[])
+static int do_cp(int argc, char *argv[])
 {
 	int ret = 1;
 	struct stat statbuf;

commands/crc.c

@@ -82,7 +82,7 @@ out:
 	return ret;
 }
 
-static int do_crc(struct command *cmdtp, int argc, char *argv[])
+static int do_crc(int argc, char *argv[])
 {
 	ulong start = 0, size = ~0, total = 0;
 	ulong crc = 0, vcrc = 0;

commands/dfu.c

@@ -95,7 +95,7 @@ static int dfu_do_parse_one(char *partstr, char **endstr, struct usb_dfu_dev *df
  * s = save mode (download whole image before flashing)
  * r = read back (firmware image can be downloaded back from host)
  */
-static int do_dfu(struct command *cmdtp, int argc, char *argv[])
+static int do_dfu(int argc, char *argv[])
 {
 	int opt, n = 0;
 	struct usb_dfu_pdata pdata;

commands/digest.c

@@ -78,7 +78,7 @@ static int do_digest(char *algorithm, int argc, char *argv[])
 
 #ifdef CONFIG_CMD_MD5SUM
 
-static int do_md5(struct command *cmdtp, int argc, char *argv[])
+static int do_md5(int argc, char *argv[])
 {
 	return do_digest("md5", argc, argv);
 }
@@ -98,7 +98,7 @@ BAREBOX_CMD_END
 
 #ifdef CONFIG_CMD_SHA1SUM
 
-static int do_sha1(struct command *cmdtp, int argc, char *argv[])
+static int do_sha1(int argc, char *argv[])
 {
 	return do_digest("sha1", argc, argv);
 }
@@ -118,7 +118,7 @@ BAREBOX_CMD_END
 
 #ifdef CONFIG_CMD_SHA224SUM
 
-static int do_sha224(struct command *cmdtp, int argc, char *argv[])
+static int do_sha224(int argc, char *argv[])
 {
 	return do_digest("sha224", argc, argv);
 }
@@ -138,7 +138,7 @@ BAREBOX_CMD_END
 
 #ifdef CONFIG_CMD_SHA256SUM
 
-static int do_sha256(struct command *cmdtp, int argc, char *argv[])
+static int do_sha256(int argc, char *argv[])
 {
 	return do_digest("sha256", argc, argv);
 }

commands/echo.c

@@ -27,7 +27,7 @@
 #include <errno.h>
 #include <libbb.h>
 
-static int do_echo(struct command *cmdtp, int argc, char *argv[])
+static int do_echo(int argc, char *argv[])
 {
 	int i, optind = 1;
 	int fd = stdout, opt, newline = 1;

commands/edit.c

@@ -387,7 +387,7 @@ static void getwinsize(void) {
 }
 #endif
 
-static int do_edit(struct command * cmdtp, int argc, char *argv[])
+static int do_edit(int argc, char *argv[])
 {
 	int lastscrcol;
 	int i;

commands/exec.c

@@ -29,7 +29,7 @@
 #include <malloc.h>
 #include <xfuncs.h>
 
-static int do_exec(struct command * cmdtp, int argc, char *argv[])
+static int do_exec(int argc, char *argv[])
 {
 	int i;
 	char *script;

commands/export.c

@@ -28,7 +28,7 @@
 #include <errno.h>
 #include <environment.h>
 
-static int do_export(struct command *cmdtp, int argc, char *argv[])
+static int do_export(int argc, char *argv[])
 {
 	int i = 1;
 	char *ptr;

commands/false.c

@@ -24,7 +24,7 @@
 #include <common.h>
 #include <command.h>
 
-static int do_false(struct command *cmdtp, int argc, char *argv[])
+static int do_false(int argc, char *argv[])
 {
 	return 1;
 }

commands/flash.c

@@ -36,7 +36,7 @@
 #include <fcntl.h>
 #include <linux/stat.h>
 
-static int do_flerase(struct command *cmdtp, int argc, char *argv[])
+static int do_flerase(int argc, char *argv[])
 {
 	int fd;
 	char *filename = NULL;
@@ -103,7 +103,7 @@ devinfo_command for partition handling.
 
  */
 
-static int do_protect(struct command *cmdtp, int argc, char *argv[])
+static int do_protect(int argc, char *argv[])
 {
 	int fd;
 	char *filename = NULL;

commands/go.c

@@ -30,7 +30,7 @@
 #include <linux/ctype.h>
 #include <errno.h>
 
-static int do_go(struct command *cmdtp, int argc, char *argv[])
+static int do_go(int argc, char *argv[])
 {
 	void	*addr;
 	int     rcode = 1;

commands/gpio.c

@@ -20,7 +20,7 @@
 #include <errno.h>
 #include <gpio.h>
 
-static int do_gpio_get_value(struct command *cmdtp, int argc, char *argv[])
+static int do_gpio_get_value(int argc, char *argv[])
 {
 	int gpio, value;
 
@@ -47,7 +47,7 @@ BAREBOX_CMD_START(gpio_get_value)
 	BAREBOX_CMD_HELP(cmd_gpio_get_value_help)
 BAREBOX_CMD_END
 
-static int do_gpio_set_value(struct command *cmdtp, int argc, char *argv[])
+static int do_gpio_set_value(int argc, char *argv[])
 {
 	int gpio, value;
 
@@ -73,7 +73,7 @@ BAREBOX_CMD_START(gpio_set_value)
 	BAREBOX_CMD_HELP(cmd_gpio_set_value_help)
 BAREBOX_CMD_END
 
-static int do_gpio_direction_input(struct command *cmdtp, int argc, char *argv[])
+static int do_gpio_direction_input(int argc, char *argv[])
 {
 	int gpio, ret;
 
@@ -100,7 +100,7 @@ BAREBOX_CMD_START(gpio_direction_input)
 	BAREBOX_CMD_HELP(cmd_gpio_direction_input_help)
 BAREBOX_CMD_END
 
-static int do_gpio_direction_output(struct command *cmdtp, int argc, char *argv[])
+static int do_gpio_direction_output(int argc, char *argv[])
 {
 	int gpio, value, ret;
 

commands/help.c

@@ -28,8 +28,10 @@
  * Use puts() instead of printf() to avoid printf buffer overflow
  * for long help messages
  */
-static int do_help(struct command * cmdtp, int argc, char *argv[])
+static int do_help(int argc, char *argv[])
 {
+	struct command *cmdtp;
+
 	if (argc == 1) {	/* show list of commands */
 		for_each_command(cmdtp) {
 			if (!cmdtp->usage)

commands/i2c.c

@@ -26,7 +26,7 @@
 #include <getopt.h>
 #include <i2c/i2c.h>
 
-static int do_i2c_probe(struct command *cmdtp, int argc, char *argv[])
+static int do_i2c_probe(int argc, char *argv[])
 {
 	struct i2c_adapter *adapter;
 	struct i2c_client client;
@@ -70,7 +70,7 @@ BAREBOX_CMD_START(i2c_probe)
 	BAREBOX_CMD_HELP(cmd_i2c_probe_help)
 BAREBOX_CMD_END
 
-static int do_i2c_write(struct command *cmdtp, int argc, char *argv[])
+static int do_i2c_write(int argc, char *argv[])
 {
 	struct i2c_adapter *adapter = NULL;
 	struct i2c_client client;
@@ -143,7 +143,7 @@ BAREBOX_CMD_START(i2c_write)
 	BAREBOX_CMD_HELP(cmd_i2c_write_help)
 BAREBOX_CMD_END
 
-static int do_i2c_read(struct command *cmdtp, int argc, char *argv[])
+static int do_i2c_read(int argc, char *argv[])
 {
 	struct i2c_adapter *adapter = NULL;
 	struct i2c_client client;

commands/insmod.c

@@ -5,7 +5,7 @@
 #include <fs.h>
 #include <malloc.h>
 
-static int do_insmod(struct command *cmdtp, int argc, char *argv[])
+static int do_insmod(int argc, char *argv[])
 {
 	struct module *module;
 	void *buf;

commands/iomem.c

@@ -43,7 +43,7 @@ static void print_resources(struct resource *res)
 	__print_resources(res, 0);
 }
 
-static int do_iomem(struct command *cmdtp, int argc, char *argv[])
+static int do_iomem(int argc, char *argv[])
 {
 	print_resources(&iomem_resource);
 

commands/led.c

@@ -28,7 +28,7 @@
 #include <getopt.h>
 #include <errno.h>
 
-static int do_led(struct command *cmdtp, int argc, char *argv[])
+static int do_led(int argc, char *argv[])
 {
 	unsigned long value;
 	struct led *led;

commands/linux16.c

@@ -147,7 +147,6 @@ struct linux_kernel_header {
 
 /**
  * Load an x86 Linux kernel bzImage and start it
- * @param cmdtp FIXME
  * @param argc parameter count
  * @param argv list of parameter
  *
@@ -155,7 +154,7 @@ struct linux_kernel_header {
  * (setup = 'real mode code' and kernel = 'protected mode code') to their
  * default locations, switches back to real mode and runs the setup code.
  */
-static int do_linux16(struct command *cmdtp, int argc, char *argv[])
+static int do_linux16(int argc, char *argv[])
 {
 	struct linux_kernel_header *lh = NULL;
 	int rc, opt;

commands/linux_exec.c

@@ -22,7 +22,7 @@
 #include <command.h>
 #include <mach/linux.h>
 
-static int do_linux_exec(struct command *cmdtp, int argc, char *argv[])
+static int do_linux_exec(int argc, char *argv[])
 {
 	int ret;
 	char **newargv;

commands/loadb.c

@@ -686,7 +686,7 @@ static struct console_device *get_current_console(void)
  *
  * @return success or failure
  */
-static int do_load_serial_bin(struct command *cmdtp, int argc, char *argv[])
+static int do_load_serial_bin(int argc, char *argv[])
 {
 	ulong offset = 0;
 	ulong addr;

commands/loadenv.c

@@ -27,7 +27,7 @@
 #include <command.h>
 #include <environment.h>
 
-static int do_loadenv(struct command *cmdtp, int argc, char *argv[])
+static int do_loadenv(int argc, char *argv[])
 {
 	char *filename, *dirname;
 

commands/loads.c

@@ -40,7 +40,7 @@ static int save_serial(ulong offset, ulong size);
 static int write_record(char *buf);
 #endif /* CONFIG_CMD_SAVES */
 
-static int do_load_serial(struct command *cmdtp, int argc, char *argv[])
+static int do_load_serial(int argc, char *argv[])
 {
 	ulong offset = 0;
 	ulong addr;
@@ -175,7 +175,7 @@ static int read_record(char *buf, ulong len)
 }
 
 #ifdef CONFIG_CMD_SAVES
-static int do_save_serial(struct command *cmdtp, int argc, char *argv[])
+static int do_save_serial(int argc, char *argv[])
 {
 	ulong offset = 0;
 	ulong size   = 0;

commands/login.c

@@ -33,7 +33,7 @@
 #define LOGIN_MODE HIDE
 #endif
 
-static int do_login(struct command *cmdtp, int argc, char *argv[])
+static int do_login(int argc, char *argv[])
 {
 	unsigned char passwd[PASSWD_MAX_LENGTH];
 	int passwd_len, opt;

commands/ls.c

@@ -111,7 +111,7 @@ out:
 	return 0;
 }
 
-static int do_ls(struct command *cmdtp, int argc, char *argv[])
+static int do_ls(int argc, char *argv[])
 {
 	int ret, opt, o;
 	struct stat s;

commands/lsmod.c

@@ -2,7 +2,7 @@
 #include <command.h>
 #include <module.h>
 
-static int do_lsmod(struct command *cmdtp, int argc, char *argv[])
+static int do_lsmod(int argc, char *argv[])
 {
 	struct module *mod;
 

commands/magicvar.c

@@ -2,7 +2,7 @@
 #include <command.h>
 #include <magicvar.h>
 
-static int do_magicvar(struct command *cmdtp, int argc, char *argv[])
+static int do_magicvar(int argc, char *argv[])
 {
 	struct magicvar *m;
 

commands/mem.c

@@ -161,7 +161,7 @@ static int mem_parse_options(int argc, char *argv[], char *optstr, int *mode,
 	return 0;
 }
 
-static int do_mem_md(struct command *cmdtp, int argc, char *argv[])
+static int do_mem_md(int argc, char *argv[])
 {
 	ulong	start = 0, size = 0x100;
 	int	r, now;
@@ -235,7 +235,7 @@ BAREBOX_CMD_START(md)
 	BAREBOX_CMD_HELP(cmd_md_help)
 BAREBOX_CMD_END
 
-static int do_mem_mw(struct command *cmdtp, int argc, char *argv[])
+static int do_mem_mw(int argc, char *argv[])
 {
 	int ret = 0;
 	int fd;
@@ -300,7 +300,7 @@ BAREBOX_CMD_START(mw)
 	BAREBOX_CMD_HELP(cmd_mw_help)
 BAREBOX_CMD_END
 
-static int do_mem_cmp(struct command *cmdtp, int argc, char *argv[])
+static int do_mem_cmp(int argc, char *argv[])
 {
 	ulong	addr1, addr2, count = ~0;
 	int	mode  = O_RWSIZE_1;
@@ -409,7 +409,7 @@ BAREBOX_CMD_START(memcmp)
 	BAREBOX_CMD_HELP(cmd_memcmp_help)
 BAREBOX_CMD_END
 
-static int do_mem_cp(struct command *cmdtp, int argc, char *argv[])
+static int do_mem_cp(int argc, char *argv[])
 {
 	ulong count;
 	ulong	dest, src;
@@ -516,7 +516,7 @@ BAREBOX_CMD_START(memcpy)
 	BAREBOX_CMD_HELP(cmd_memcpy_help)
 BAREBOX_CMD_END
 
-static int do_memset(struct command *cmdtp, int argc, char *argv[])
+static int do_memset(int argc, char *argv[])
 {
 	ulong	s, c, n;
 	int     fd;

commands/meminfo.c

@@ -23,7 +23,7 @@
 #include <command.h>
 #include <malloc.h>
 
-static int do_meminfo(struct command *cmdtp, int argc, char *argv[])
+static int do_meminfo(int argc, char *argv[])
 {
 	malloc_stats();
 

commands/memtest.c

@@ -322,7 +322,7 @@ static int mem_test(ulong _start, ulong _end, ulong pattern)
 }
 #endif
 
-static int do_mem_mtest(struct command *cmdtp, int argc, char *argv[])
+static int do_mem_mtest(int argc, char *argv[])
 {
 	ulong start, end, pattern = 0;
 

commands/menu.c

@@ -306,7 +306,7 @@ static int do_menu_entry(struct cmd_menu *cm)
 }
 #endif
 
-static int do_menu(struct command *cmdtp, int argc, char *argv[])
+static int do_menu(int argc, char *argv[])
 {
 	struct cmd_menu cm;
 	int opt;

commands/mkdir.c

@@ -26,7 +26,7 @@
 #include <errno.h>
 #include <getopt.h>
 
-static int do_mkdir(struct command *cmdtp, int argc, char *argv[])
+static int do_mkdir(int argc, char *argv[])
 {
 	int opt, parent = 0, ret;
 

commands/mount.c

@@ -30,7 +30,7 @@
 #include <fs.h>
 #include <errno.h>
 
-static int do_mount(struct command *cmdtp, int argc, char *argv[])
+static int do_mount(int argc, char *argv[])
 {
 	int ret = 0;
 	struct mtab_entry *entry;

commands/nand.c

@@ -36,7 +36,7 @@
 #define NAND_DEL (1 << 1)
 #define NAND_MARKBAD (1 << 2)
 
-static int do_nand(struct command *cmdtp, int argc, char *argv[])
+static int do_nand(int argc, char *argv[])
 {
 	int opt;
 	int command = 0, badblock = 0;

commands/nandtest.c

@@ -186,7 +186,7 @@ static void print_stats(int nr_passes, int length)
 }
 
 /* Main program. */
-static int do_nandtest(struct command *cmdtp, int argc, char *argv[])
+static int do_nandtest(int argc, char *argv[])
 {
 	int opt, length = -1, do_nandtest_dev = -1;
 	off_t flash_offset = 0;

commands/net.c

@@ -38,7 +38,7 @@
 #ifdef CONFIG_NET_RARP
 extern void RarpRequest(void);
 
-static int do_rarpb(struct command *cmdtp, int argc, char *argv[])
+static int do_rarpb(int argc, char *argv[])
 {
 	int size;
 
@@ -64,7 +64,7 @@ BAREBOX_CMD_START(rarpboot)
 BAREBOX_CMD_END
 #endif /* CONFIG_NET_RARP */
 
-static int do_ethact(struct command *cmdtp, int argc, char *argv[])
+static int do_ethact(int argc, char *argv[])
 {
 	struct eth_device *edev;
 

commands/oftree.c

@@ -40,7 +40,7 @@
 #include <getopt.h>
 #include <init.h>
 
-static int do_oftree(struct command *cmdtp, int argc, char *argv[])
+static int do_oftree(int argc, char *argv[])
 {
 	struct fdt_header *fdt;
 	int size;

commands/partition.c

@@ -107,7 +107,7 @@ static int mtd_part_do_parse_one(char *devname, const char *partstr,
 	return ret;
 }
 
-static int do_addpart(struct command * cmdtp, int argc, char *argv[])
+static int do_addpart(int argc, char *argv[])
 {
 	char *devname;
 	char *endp;
@@ -174,7 +174,7 @@ BAREBOX_CMD_START(addpart)
 	BAREBOX_CMD_HELP(cmd_addpart_help)
 BAREBOX_CMD_END
 
-static int do_delpart(struct command * cmdtp, int argc, char *argv[])
+static int do_delpart(int argc, char *argv[])
 {
 	int i, err;
 

commands/passwd.c

@@ -33,7 +33,7 @@
 #define PASSWD_MODE HIDE
 #endif
 
-static int do_passwd(struct command *cmdtp, int argc, char *argv[])
+static int do_passwd(int argc, char *argv[])
 {
 	unsigned char passwd2[PASSWD_MAX_LENGTH];
 	unsigned char passwd1[PASSWD_MAX_LENGTH];

commands/printenv.c

@@ -28,7 +28,7 @@
 #include <errno.h>
 #include <environment.h>
 
-static int do_printenv(struct command *cmdtp, int argc, char *argv[])
+static int do_printenv(int argc, char *argv[])
 {
 	struct variable_d *var;
 	struct env_context *c, *current_c;

commands/pwd.c

@@ -23,7 +23,7 @@
 #include <command.h>
 #include <fs.h>
 
-static int do_pwd(struct command *cmdtp, int argc, char *argv[])
+static int do_pwd(int argc, char *argv[])
 {
 	printf("%s\n", getcwd());
 	return 0;

commands/readline.c

@@ -27,7 +27,7 @@
 #include <xfuncs.h>
 #include <environment.h>
 
-static int do_readline(struct command *cmdtp, int argc, char *argv[])
+static int do_readline(int argc, char *argv[])
 {
 	char *buf = xzalloc(CONFIG_CBSIZE);
 

commands/reginfo.c

@@ -23,7 +23,7 @@
 #include <common.h>
 #include <command.h>
 
-static int do_reginfo(struct command *cmdtp, int argc, char *argv[])
+static int do_reginfo(int argc, char *argv[])
 {
 	reginfo();
 	return 0;

commands/reset.c

@@ -23,7 +23,7 @@
 #include <common.h>
 #include <command.h>
 
-static int cmd_reset(struct command *cmdtp, int argc, char *argv[])
+static int cmd_reset(int argc, char *argv[])
 {
 	reset_cpu(0);
 

commands/rm.c

@@ -24,7 +24,7 @@
 #include <fs.h>
 #include <errno.h>
 
-static int do_rm(struct command *cmdtp, int argc, char *argv[])
+static int do_rm(int argc, char *argv[])
 {
 	int i = 1;
 

commands/rmdir.c

@@ -3,7 +3,7 @@
 #include <fs.h>
 #include <errno.h>
 
-static int do_rmdir(struct command *cmdtp, int argc, char *argv[])
+static int do_rmdir(int argc, char *argv[])
 {
 	int i = 1;
 

commands/saveenv.c

@@ -30,7 +30,7 @@
 #include <fcntl.h>
 #include <environment.h>
 
-static int do_saveenv(struct command *cmdtp, int argc, char *argv[])
+static int do_saveenv(int argc, char *argv[])
 {
 	int ret, fd;
 	char *filename, *dirname;

commands/setenv.c

@@ -28,7 +28,7 @@
 #include <errno.h>
 #include <environment.h>
 
-static int do_setenv(struct command *cmdtp, int argc, char *argv[])
+static int do_setenv(int argc, char *argv[])
 {
 	if (argc < 2)
 		return COMMAND_ERROR_USAGE;

commands/sleep.c

@@ -24,7 +24,7 @@
 #include <command.h>
 #include <clock.h>
 
-static int do_sleep(struct command *cmdtp, int argc, char *argv[])
+static int do_sleep(int argc, char *argv[])
 {
 	uint64_t start;
 	ulong delay;

commands/test.c

@@ -76,7 +76,7 @@ static int parse_opt(const char *opt)
 	return -1;
 }
 
-static int do_test(struct command *cmdtp, int argc, char *argv[])
+static int do_test(int argc, char *argv[])
 {
 	char **ap;
 	int left, adv, expr, last_expr, neg, last_cmp, opt, zero;

commands/time.c

@@ -4,7 +4,7 @@
 #include <asm-generic/div64.h>
 #include <malloc.h>
 
-static int do_time(struct command *cmdtp, int argc, char *argv[])
+static int do_time(int argc, char *argv[])
 {
 	int i;
 	unsigned char *buf;

commands/timeout.c

@@ -31,7 +31,7 @@
 #define TIMEOUT_ANYKEY	(1 << 2)
 #define TIMEOUT_SILENT	(1 << 3)
 
-static int do_timeout(struct command *cmdtp, int argc, char *argv[])
+static int do_timeout(int argc, char *argv[])
 {
 	int timeout = 3, ret = 1;
 	int flags = 0, opt, countdown;

commands/trigger.c

@@ -40,7 +40,7 @@ static char *trigger_names[] = {
 	[LED_TRIGGER_NET_TXRX] = "net",
 };
 
-static int do_trigger(struct command *cmdtp, int argc, char *argv[])
+static int do_trigger(int argc, char *argv[])
 {
 	struct led *led;
 	int i, opt, ret = 0;

commands/true.c

@@ -24,7 +24,7 @@
 #include <common.h>
 #include <command.h>
 
-static int do_true(struct command *cmdtp, int argc, char *argv[])
+static int do_true(int argc, char *argv[])
 {
 	return 0;
 }

commands/ubi.c

@@ -11,7 +11,7 @@
 #include <mtd/ubi-user.h>
 #include <ubi-media.h>
 
-static int do_ubimkvol(struct command *cmdtp, int argc, char *argv[])
+static int do_ubimkvol(int argc, char *argv[])
 {
 	struct ubi_mkvol_req req;
 	int fd, ret;
@@ -56,7 +56,7 @@ BAREBOX_CMD_START(ubimkvol)
 BAREBOX_CMD_END
 
 
-static int do_ubiattach(struct command *cmdtp, int argc, char *argv[])
+static int do_ubiattach(int argc, char *argv[])
 {
 	struct mtd_info_user user;
 	int fd, ret;
@@ -92,7 +92,7 @@ BAREBOX_CMD_START(ubiattach)
 	BAREBOX_CMD_HELP(cmd_ubiattach_help)
 BAREBOX_CMD_END
 
-static int do_ubirmvol(struct command *cmdtp, int argc, char *argv[])
+static int do_ubirmvol(int argc, char *argv[])
 {
 	struct ubi_mkvol_req req;
 	int fd, ret;

commands/uimage.c

@@ -19,7 +19,7 @@ static int uimage_flush(void *buf, unsigned int len)
 	return ret;
 }
 
-static int do_uimage(struct command *cmdtp, int argc, char *argv[])
+static int do_uimage(int argc, char *argv[])
 {
 	struct uimage_handle *handle;
 	int ret;

commands/umount.c

@@ -24,7 +24,7 @@
 #include <fs.h>
 #include <errno.h>
 
-static int do_umount(struct command *cmdtp, int argc, char *argv[])
+static int do_umount(int argc, char *argv[])
 {
 	int ret = 0;
 

commands/uncompress.c

@@ -27,7 +27,7 @@
 #include <fs.h>
 #include <uncompress.h>
 
-static int do_uncompress(struct command *cmdtp, int argc, char *argv[])
+static int do_uncompress(int argc, char *argv[])
 {
 	int from, to, ret;
 

commands/usb.c

@@ -23,7 +23,7 @@
 #include <command.h>
 #include <usb/usb.h>
 
-static int do_usb(struct command *cmdtp, int argc, char *argv[])
+static int do_usb(int argc, char *argv[])
 {
 	usb_rescan();
 

commands/usbserial.c

@@ -30,7 +30,7 @@
 #include <xfuncs.h>
 #include <usb/usbserial.h>
 
-static int do_usbserial(struct command *cmdtp, int argc, char *argv[])
+static int do_usbserial(int argc, char *argv[])
 {
 	int opt;
 	struct usb_serial_pdata pdata;

commands/version.c

@@ -24,7 +24,7 @@
 #include <common.h>
 #include <command.h>
 
-static int do_version(struct command *cmdtp, int argc, char *argv[])
+static int do_version(int argc, char *argv[])
 {
 	printf ("\n%s\n", version_string);
 	return 0;

common/command.c

@@ -40,7 +40,7 @@ EXPORT_SYMBOL(command_list);
 
 #ifdef CONFIG_SHELL_HUSH
 
-static int do_exit(struct command *cmdtp, int argc, char *argv[])
+static int do_exit(int argc, char *argv[])
 {
 	int r;
 
@@ -98,7 +98,7 @@ int execute_command(int argc, char **argv)
 	/* Look up command in command table */
 	if ((cmdtp = find_cmd(argv[0]))) {
 		/* OK - call function to do the command */
-		ret = cmdtp->cmd(cmdtp, argc, argv);
+		ret = cmdtp->cmd(argc, argv);
 		if (ret == COMMAND_ERROR_USAGE) {
 			barebox_cmd_usage(cmdtp);
 			ret = COMMAND_ERROR;

common/hush.c

@@ -126,7 +126,7 @@
 #include <linux/list.h>
 
 /*cmd_boot.c*/
-extern int do_bootd(struct command *cmdtp, int flag, int argc, char *argv[]);      /* do_bootd */
+extern int do_bootd(int flag, int argc, char *argv[]);      /* do_bootd */
 #define SPECIAL_VAR_SYMBOL 03
 
 
@@ -1657,7 +1657,7 @@ int run_shell(void)
 	return rcode;
 }
 
-static int do_sh(struct command *cmdtp, int argc, char *argv[])
+static int do_sh(int argc, char *argv[])
 {
 	if (argc < 2)
 		return COMMAND_ERROR_USAGE;
@@ -1676,7 +1676,7 @@ BAREBOX_CMD_START(sh)
 	BAREBOX_CMD_HELP(cmd_sh_help)
 BAREBOX_CMD_END
 
-static int do_source(struct command *cmdtp, int argc, char *argv[])
+static int do_source(int argc, char *argv[])
 {
 	if (argc < 2)
 		return COMMAND_ERROR_USAGE;
@@ -1705,7 +1705,7 @@ BAREBOX_CMD_START(source)
 BAREBOX_CMD_END
 
 #ifdef CONFIG_HUSH_GETOPT
-static int do_getopt(struct command *cmdtp, int argc, char *argv[])
+static int do_getopt(int argc, char *argv[])
 {
 	/*
 	 * This function is never reached. The 'getopt' command is

drivers/base/driver.c

@@ -351,7 +351,7 @@ static int do_devinfo_subtree(struct device_d *dev, int depth)
 	return 0;
 }
 
-static int do_devinfo(struct command *cmdtp, int argc, char *argv[])
+static int do_devinfo(int argc, char *argv[])
 {
 	struct device_d *dev;
 	struct driver_d *drv;

drivers/mtd/nand/nand_s3c24xx.c

@@ -606,7 +606,7 @@ void __nand_boot_init s3c24x0_nand_load_image(void *dest, int size, int page)
 #ifdef CONFIG_NAND_S3C24XX_BOOT_DEBUG
 #include <command.h>
 
-static int do_nand_boot_test(struct command *cmdtp, int argc, char *argv[])
+static int do_nand_boot_test(int argc, char *argv[])
 {
 	void *dest;
 	int size;

drivers/usb/gadget/u_serial.c

@@ -486,7 +486,7 @@ fail_out:
 }
 #include <command.h>
 
-static int do_mycdev(struct command *cmdtp, int argc, char *argv[])
+static int do_mycdev(int argc, char *argv[])
 {
 
 	int i,j;

include/command.h

@@ -47,7 +47,7 @@ struct command {
 	const char	*name;		/* Command Name			*/
 	const char	**aliases;
 					/* Implementation function	*/
-	int		(*cmd)(struct command *, int, char *[]);
+	int		(*cmd)(int, char *[]);
 	const char	*usage;		/* Usage message	(short)	*/
 
 	struct list_head list;		/* List of commands		*/

net/dhcp.c

@@ -436,7 +436,7 @@ static void dhcp_handler(void *ctx, char *packet, unsigned int len)
 	}
 }
 
-static int do_dhcp(struct command *cmdtp, int argc, char *argv[])
+static int do_dhcp(int argc, char *argv[])
 {
 	int ret;
 

net/dns.c

@@ -234,7 +234,7 @@ IPaddr_t resolv(char *host)
 	return dns_ip;
 }
 
-static int do_host(struct command *cmdtp, int argc, char *argv[])
+static int do_host(int argc, char *argv[])
 {
 	IPaddr_t ip;
 

net/nfs.c

@@ -668,7 +668,7 @@ static void nfs_start(char *p)
 	nfs_send();
 }
 
-static int do_nfs(struct command *cmdtp, int argc, char *argv[])
+static int do_nfs(int argc, char *argv[])
 {
 	char  *localfile;
 	char  *remotefile;

net/ping.c

@@ -52,7 +52,7 @@ static void ping_handler(void *ctx, char *pkt, unsigned len)
 	ping_state = PING_STATE_SUCCESS;
 }
 
-static int do_ping(struct command *cmdtp, int argc, char *argv[])
+static int do_ping(int argc, char *argv[])
 {
 	int ret;
 	uint64_t ping_start = 0;

net/tftp.c

@@ -267,7 +267,7 @@ static void tftp_handler(void *ctx, char *packet, unsigned len)
 	}
 }
 
-static int do_tftpb(struct command *cmdtp, int argc, char *argv[])
+static int do_tftpb(int argc, char *argv[])
 {
 	char *localfile, *remotefile, *file1, *file2;
 	char ip1[16];