Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

Staging: otus: use ARRAY_SIZE

Change sizeof(x) / sizeof(*x) to ARRAY_SIZE(x).

Signed-off-by: Kulikov Vasiliy <segooon@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

authored by

Kulikov Vasiliy and committed by
Greg Kroah-Hartman
19ebeff1 3d63a492

+10 -18
+10 -18
drivers/staging/otus/hal/hpmain.c
··· 430 430 * Register setting by mode 431 431 */ 432 432 433 - entries = sizeof(ar5416Modes) / sizeof(*ar5416Modes); 433 + entries = ARRAY_SIZE(ar5416Modes); 434 434 zm_msg1_scan(ZM_LV_2, "Modes register setting entries=", entries); 435 435 for (i=0; i<entries; i++) 436 436 { ··· 496 496 /* 497 497 * Common Register setting 498 498 */ 499 - entries = sizeof(ar5416Common) / sizeof(*ar5416Common); 499 + entries = ARRAY_SIZE(ar5416Common); 500 500 for (i=0; i<entries; i++) 501 501 { 502 502 reg_write(ar5416Common[i][0], ar5416Common[i][1]); ··· 506 506 /* 507 507 * RF Gain setting by freqIndex 508 508 */ 509 - entries = sizeof(ar5416BB_RfGain) / sizeof(*ar5416BB_RfGain); 509 + entries = ARRAY_SIZE(ar5416BB_RfGain); 510 510 for (i=0; i<entries; i++) 511 511 { 512 512 reg_write(ar5416BB_RfGain[i][0], ar5416BB_RfGain[i][freqIndex]); ··· 963 963 /* Bank 0 1 2 3 5 6 7 */ 964 964 void zfSetRfRegs(zdev_t* dev, u32_t frequency) 965 965 { 966 - u16_t entries; 967 966 u16_t freqIndex = 0; 968 967 u16_t i; 969 968 ··· 983 984 } 984 985 985 986 #if 1 986 - entries = sizeof(otusBank) / sizeof(*otusBank); 987 - for (i=0; i<entries; i++) 987 + for (i=0; i<ARRAY_SIZE(otusBank); i++) 988 988 { 989 989 reg_write(otusBank[i][0], otusBank[i][freqIndex]); 990 990 } 991 991 #else 992 992 /* Bank0 */ 993 - entries = sizeof(ar5416Bank0) / sizeof(*ar5416Bank0); 994 - for (i=0; i<entries; i++) 993 + for (i=0; i<ARRAY_SIZE(ar5416Bank0); i++) 995 994 { 996 995 reg_write(ar5416Bank0[i][0], ar5416Bank0[i][1]); 997 996 } 998 997 /* Bank1 */ 999 - entries = sizeof(ar5416Bank1) / sizeof(*ar5416Bank1); 1000 - for (i=0; i<entries; i++) 998 + for (i=0; i<ARRAY_SIZE(ar5416Bank1); i++) 1001 999 { 1002 1000 reg_write(ar5416Bank1[i][0], ar5416Bank1[i][1]); 1003 1001 } 1004 1002 /* Bank2 */ 1005 - entries = sizeof(ar5416Bank2) / sizeof(*ar5416Bank2); 1006 - for (i=0; i<entries; i++) 1003 + for (i=0; i<ARRAY_SIZE(ar5416Bank2); i++) 1007 1004 { 1008 1005 reg_write(ar5416Bank2[i][0], ar5416Bank2[i][1]); 1009 1006 } 1010 1007 /* Bank3 */ 1011 - entries = sizeof(ar5416Bank3) / sizeof(*ar5416Bank3); 1012 - for (i=0; i<entries; i++) 1008 + for (i=0; i<ARRAY_SIZE(ar5416Bank3); i++) 1013 1009 { 1014 1010 reg_write(ar5416Bank3[i][0], ar5416Bank3[i][freqIndex]); 1015 1011 } ··· 1012 1018 reg_write (0x98b0, 0x00000013); 1013 1019 reg_write (0x98e4, 0x00000002); 1014 1020 /* Bank6 */ 1015 - entries = sizeof(ar5416Bank6) / sizeof(*ar5416Bank6); 1016 - for (i=0; i<entries; i++) 1021 + for (i=0; i<ARRAY_SIZE(ar5416Bank6); i++) 1017 1022 { 1018 1023 reg_write(ar5416Bank6[i][0], ar5416Bank6[i][freqIndex]); 1019 1024 } 1020 1025 /* Bank7 */ 1021 - entries = sizeof(ar5416Bank7) / sizeof(*ar5416Bank7); 1022 - for (i=0; i<entries; i++) 1026 + for (i=0; i<ARRAY_SIZE(ar5416Bank7); i++) 1023 1027 { 1024 1028 reg_write(ar5416Bank7[i][0], ar5416Bank7[i][1]); 1025 1029 }