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>
This commit is contained in:
Родитель
c00acf46de
Коммит
ef878b8899
|
@ -82,7 +82,7 @@ PNMI_STATIC int DiagActions(SK_AC *pAC, SK_IOC IoC, int action, SK_U32 Id,
|
|||
|
||||
|
||||
/* defines *******************************************************************/
|
||||
#define ID_TABLE_SIZE (sizeof(IdTable)/sizeof(IdTable[0]))
|
||||
#define ID_TABLE_SIZE ARRAY_SIZE(IdTable)
|
||||
|
||||
|
||||
/* global variables **********************************************************/
|
||||
|
|
|
@ -388,18 +388,6 @@ int Level) /* Initialization level */
|
|||
SK_PNMI_CNT_NO, SK_PNMI_MAX_IDX));
|
||||
}
|
||||
|
||||
if (SK_PNMI_MAX_IDX !=
|
||||
(sizeof(StatAddr) / (sizeof(SK_PNMI_STATADDR) * SK_PNMI_MAC_TYPES))) {
|
||||
|
||||
SK_ERR_LOG(pAC, SK_ERRCL_SW, SK_PNMI_ERR050, SK_PNMI_ERR050MSG);
|
||||
|
||||
SK_DBG_MSG(pAC, SK_DBGMOD_PNMI, SK_DBGCAT_INIT | SK_DBGCAT_FATAL,
|
||||
("StatAddr table size (%d) differs from "
|
||||
"SK_PNMI_MAX_IDX (%d)\n",
|
||||
(sizeof(StatAddr) /
|
||||
(sizeof(SK_PNMI_STATADDR) * SK_PNMI_MAC_TYPES)),
|
||||
SK_PNMI_MAX_IDX));
|
||||
}
|
||||
#endif /* SK_PNMI_CHECK */
|
||||
break;
|
||||
|
||||
|
|
|
@ -892,7 +892,7 @@ int Port) /* Which port should be checked */
|
|||
*/
|
||||
RxCts = 0;
|
||||
|
||||
for (i = 0; i < sizeof(SkGeRxRegs)/sizeof(SkGeRxRegs[0]); i++) {
|
||||
for (i = 0; i < ARRAY_SIZE(SkGeRxRegs); i++) {
|
||||
|
||||
(void)SkXmMacStatistic(pAC, IoC, Port, SkGeRxRegs[i], &RxTmp);
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче