projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dfu: mmc: buffer file reads too
[oweals/u-boot.git]
/
drivers
/
misc
/
ds4510.c
diff --git
a/drivers/misc/ds4510.c
b/drivers/misc/ds4510.c
index 8b5fbbc45651a262c825517835e9e9f11d95df23..aa893c35fbbde99dffbbcfcc3e4e73013b5b0427 100644
(file)
--- a/
drivers/misc/ds4510.c
+++ b/
drivers/misc/ds4510.c
@@
-273,7
+273,7
@@
cmd_tbl_t cmd_ds4510[] = {
#endif
};
#endif
};
-int do_ds4510(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+int do_ds4510(cmd_tbl_t *cmdtp, int flag, int argc, char *
const
argv[])
{
static uint8_t chip = CONFIG_SYS_I2C_DS4510_ADDR;
cmd_tbl_t *c;
{
static uint8_t chip = CONFIG_SYS_I2C_DS4510_ADDR;
cmd_tbl_t *c;
@@
-294,8
+294,7
@@
int do_ds4510(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
if (!c || !((argc == (c->maxargs)) ||
(((int)c->cmd == DS4510_CMD_DEVICE) &&
(argc == (c->maxargs - 1))))) {
if (!c || !((argc == (c->maxargs)) ||
(((int)c->cmd == DS4510_CMD_DEVICE) &&
(argc == (c->maxargs - 1))))) {
- cmd_usage(cmdtp);
- return 1;
+ return cmd_usage(cmdtp);
}
/* arg2 used as chip addr and pin number */
}
/* arg2 used as chip addr and pin number */
@@
-366,14
+365,12
@@
int do_ds4510(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
#ifdef CONFIG_CMD_DS4510_MEM
/* Only eeprom, seeprom, and sram commands should make it here */
#ifdef CONFIG_CMD_DS4510_MEM
/* Only eeprom, seeprom, and sram commands should make it here */
- if (strcmp(argv[2], "read") == 0)
{
+ if (strcmp(argv[2], "read") == 0)
rw_func = ds4510_mem_read;
rw_func = ds4510_mem_read;
- } else if (strcmp(argv[2], "write") == 0) {
+ else if (strcmp(argv[2], "write") == 0)
rw_func = ds4510_mem_write;
rw_func = ds4510_mem_write;
- } else {
- cmd_usage(cmdtp);
- return 1;
- }
+ else
+ return cmd_usage(cmdtp);
addr = simple_strtoul(argv[3], NULL, 16);
off += simple_strtoul(argv[4], NULL, 16);
addr = simple_strtoul(argv[3], NULL, 16);
off += simple_strtoul(argv[4], NULL, 16);
@@
-404,12
+401,14
@@
U_BOOT_CMD(
"ds4510 pullup pin 0|1\n"
" - disable/enable pullup on specified pin\n"
"ds4510 nv 0|1\n"
"ds4510 pullup pin 0|1\n"
" - disable/enable pullup on specified pin\n"
"ds4510 nv 0|1\n"
- " - make gpio and seeprom writes volatile/non-volatile
\n
"
+ " - make gpio and seeprom writes volatile/non-volatile"
#ifdef CONFIG_CMD_DS4510_RST
#ifdef CONFIG_CMD_DS4510_RST
+ "\n"
"ds4510 rstdelay 0-3\n"
"ds4510 rstdelay 0-3\n"
- " - set reset output delay
\n
"
+ " - set reset output delay"
#endif
#ifdef CONFIG_CMD_DS4510_MEM
#endif
#ifdef CONFIG_CMD_DS4510_MEM
+ "\n"
"ds4510 eeprom read addr off cnt\n"
"ds4510 eeprom write addr off cnt\n"
" - read/write 'cnt' bytes at EEPROM offset 'off'\n"
"ds4510 eeprom read addr off cnt\n"
"ds4510 eeprom write addr off cnt\n"
" - read/write 'cnt' bytes at EEPROM offset 'off'\n"
@@
-418,7
+417,7
@@
U_BOOT_CMD(
" - read/write 'cnt' bytes at SRAM-shadowed EEPROM offset 'off'\n"
"ds4510 sram read addr off cnt\n"
"ds4510 sram write addr off cnt\n"
" - read/write 'cnt' bytes at SRAM-shadowed EEPROM offset 'off'\n"
"ds4510 sram read addr off cnt\n"
"ds4510 sram write addr off cnt\n"
- " - read/write 'cnt' bytes at SRAM offset 'off'
\n
"
+ " - read/write 'cnt' bytes at SRAM offset 'off'"
#endif
);
#endif /* CONFIG_CMD_DS4510 */
#endif
);
#endif /* CONFIG_CMD_DS4510 */