Skip to content
Snippets Groups Projects
Commit cfb25cc4 authored by Axel Lin's avatar Axel Lin Committed by Heiko Schocher
Browse files

cmd_i2c: Use ARRAY_SIZE instead of reinventing it

parent 67bfae36
No related branches found
No related tags found
No related merge requests found
...@@ -127,8 +127,6 @@ static uchar i2c_no_probes[] = CONFIG_SYS_I2C_NOPROBES; ...@@ -127,8 +127,6 @@ static uchar i2c_no_probes[] = CONFIG_SYS_I2C_NOPROBES;
#define COMPARE_ADDR(a,i) (i2c_no_probes[(i)] == (a)) #define COMPARE_ADDR(a,i) (i2c_no_probes[(i)] == (a))
#define NO_PROBE_ADDR(i) i2c_no_probes[(i)] #define NO_PROBE_ADDR(i) i2c_no_probes[(i)]
#endif /* defined(CONFIG_SYS_I2C) */ #endif /* defined(CONFIG_SYS_I2C) */
#define NUM_ELEMENTS_NOPROBE (sizeof(i2c_no_probes)/sizeof(i2c_no_probes[0]))
#endif #endif
#define DISP_LINE_LEN 16 #define DISP_LINE_LEN 16
...@@ -717,7 +715,7 @@ static int do_i2c_probe (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv ...@@ -717,7 +715,7 @@ static int do_i2c_probe (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv
#if defined(CONFIG_SYS_I2C_NOPROBES) #if defined(CONFIG_SYS_I2C_NOPROBES)
skip = 0; skip = 0;
for (k=0; k < NUM_ELEMENTS_NOPROBE; k++) { for (k = 0; k < ARRAY_SIZE(i2c_no_probes); k++) {
if (COMPARE_BUS(bus, k) && COMPARE_ADDR(j, k)) { if (COMPARE_BUS(bus, k) && COMPARE_ADDR(j, k)) {
skip = 1; skip = 1;
break; break;
...@@ -735,7 +733,7 @@ static int do_i2c_probe (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv ...@@ -735,7 +733,7 @@ static int do_i2c_probe (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv
#if defined(CONFIG_SYS_I2C_NOPROBES) #if defined(CONFIG_SYS_I2C_NOPROBES)
puts ("Excluded chip addresses:"); puts ("Excluded chip addresses:");
for (k=0; k < NUM_ELEMENTS_NOPROBE; k++) { for (k = 0; k < ARRAY_SIZE(i2c_no_probes); k++) {
if (COMPARE_BUS(bus,k)) if (COMPARE_BUS(bus,k))
printf(" %02X", NO_PROBE_ADDR(k)); printf(" %02X", NO_PROBE_ADDR(k));
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment