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

sk98lin: kill bogus check and convert to use ARRAY_SIZE()

This converts uses of ARRAY_SIZE(), and while at it also kills
unreachable code as far as I can say. I can't tell what was the author
trying to do with the following check. First we have:

PNMI_STATIC const SK_PNMI_STATADDR
StatAddr[SK_PNMI_MAX_IDX][SK_PNMI_MAC_TYPES];

and then a check goes like this:

if (SK_PNMI_MAX_IDX !=
(sizeof(StatAddr) / (sizeof(SK_PNMI_STATADDR) * SK_PNMI_MAC_TYPES)))

with the second line being just ARRAY_SIZE(StatAddr), which will always
return SK_PNMI_MAX_IDX, rendering the check useless.

Signed-off-by: Alejandro Martinez Ruiz <alex@flawedcode.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>

authored by

Alejandro Martinez Ruiz and committed by
David S. Miller
ef878b88 c00acf46

+2 -14
+1 -1
drivers/net/sk98lin/skgemib.c
··· 82 82 83 83 84 84 /* defines *******************************************************************/ 85 - #define ID_TABLE_SIZE (sizeof(IdTable)/sizeof(IdTable[0])) 85 + #define ID_TABLE_SIZE ARRAY_SIZE(IdTable) 86 86 87 87 88 88 /* global variables **********************************************************/
-12
drivers/net/sk98lin/skgepnmi.c
··· 388 388 SK_PNMI_CNT_NO, SK_PNMI_MAX_IDX)); 389 389 } 390 390 391 - if (SK_PNMI_MAX_IDX != 392 - (sizeof(StatAddr) / (sizeof(SK_PNMI_STATADDR) * SK_PNMI_MAC_TYPES))) { 393 - 394 - SK_ERR_LOG(pAC, SK_ERRCL_SW, SK_PNMI_ERR050, SK_PNMI_ERR050MSG); 395 - 396 - SK_DBG_MSG(pAC, SK_DBGMOD_PNMI, SK_DBGCAT_INIT | SK_DBGCAT_FATAL, 397 - ("StatAddr table size (%d) differs from " 398 - "SK_PNMI_MAX_IDX (%d)\n", 399 - (sizeof(StatAddr) / 400 - (sizeof(SK_PNMI_STATADDR) * SK_PNMI_MAC_TYPES)), 401 - SK_PNMI_MAX_IDX)); 402 - } 403 391 #endif /* SK_PNMI_CHECK */ 404 392 break; 405 393
+1 -1
drivers/net/sk98lin/skgesirq.c
··· 892 892 */ 893 893 RxCts = 0; 894 894 895 - for (i = 0; i < sizeof(SkGeRxRegs)/sizeof(SkGeRxRegs[0]); i++) { 895 + for (i = 0; i < ARRAY_SIZE(SkGeRxRegs); i++) { 896 896 897 897 (void)SkXmMacStatistic(pAC, IoC, Port, SkGeRxRegs[i], &RxTmp); 898 898