Commit c8b8857e authored by Kulikov Vasiliy's avatar Kulikov Vasiliy Committed by Greg Kroah-Hartman

Staging: otus: use ARRAY_SIZE

Change sizeof(x) / sizeof(*x) to ARRAY_SIZE(x).
Signed-off-by: default avatarKulikov Vasiliy <segooon@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 2addf798
...@@ -72,7 +72,6 @@ s32_t BEACON_RSSI(zdev_t *dev) ...@@ -72,7 +72,6 @@ s32_t BEACON_RSSI(zdev_t *dev)
void zfHpAniAttach(zdev_t *dev) void zfHpAniAttach(zdev_t *dev)
{ {
#define N(a) (sizeof(a) / sizeof(a[0]))
u32_t i; u32_t i;
struct zsHpPriv *HpPriv; struct zsHpPriv *HpPriv;
...@@ -125,7 +124,6 @@ void zfHpAniAttach(zdev_t *dev) ...@@ -125,7 +124,6 @@ void zfHpAniAttach(zdev_t *dev)
HpPriv->stats.ast_nodestats.ns_avgbrssi = ZM_RSSI_DUMMY_MARKER; HpPriv->stats.ast_nodestats.ns_avgbrssi = ZM_RSSI_DUMMY_MARKER;
HpPriv->stats.ast_nodestats.ns_avgrssi = ZM_RSSI_DUMMY_MARKER; HpPriv->stats.ast_nodestats.ns_avgrssi = ZM_RSSI_DUMMY_MARKER;
HpPriv->stats.ast_nodestats.ns_avgtxrssi = ZM_RSSI_DUMMY_MARKER; HpPriv->stats.ast_nodestats.ns_avgtxrssi = ZM_RSSI_DUMMY_MARKER;
#undef N
} }
/* /*
...@@ -133,7 +131,6 @@ void zfHpAniAttach(zdev_t *dev) ...@@ -133,7 +131,6 @@ void zfHpAniAttach(zdev_t *dev)
*/ */
u8_t zfHpAniControl(zdev_t *dev, ZM_HAL_ANI_CMD cmd, int param) u8_t zfHpAniControl(zdev_t *dev, ZM_HAL_ANI_CMD cmd, int param)
{ {
#define N(a) (sizeof(a)/sizeof(a[0]))
typedef s32_t TABLE[]; typedef s32_t TABLE[];
struct zsHpPriv *HpPriv; struct zsHpPriv *HpPriv;
struct zsAniState *aniState; struct zsAniState *aniState;
...@@ -148,9 +145,9 @@ u8_t zfHpAniControl(zdev_t *dev, ZM_HAL_ANI_CMD cmd, int param) ...@@ -148,9 +145,9 @@ u8_t zfHpAniControl(zdev_t *dev, ZM_HAL_ANI_CMD cmd, int param)
{ {
u32_t level = param; u32_t level = param;
if (level >= N(HpPriv->totalSizeDesired)) { if (level >= ARRAY_SIZE(HpPriv->totalSizeDesired)) {
zm_debug_msg1("level out of range, desired level : ", level); zm_debug_msg1("level out of range, desired level : ", level);
zm_debug_msg1("max level : ", N(HpPriv->totalSizeDesired)); zm_debug_msg1("max level : ", ARRAY_SIZE(HpPriv->totalSizeDesired));
return FALSE; return FALSE;
} }
...@@ -260,10 +257,10 @@ u8_t zfHpAniControl(zdev_t *dev, ZM_HAL_ANI_CMD cmd, int param) ...@@ -260,10 +257,10 @@ u8_t zfHpAniControl(zdev_t *dev, ZM_HAL_ANI_CMD cmd, int param)
const TABLE firstep = { 0, 4, 8 }; const TABLE firstep = { 0, 4, 8 };
u32_t level = param; u32_t level = param;
if (level >= N(firstep)) if (level >= ARRAY_SIZE(firstep))
{ {
zm_debug_msg1("level out of range, desired level : ", level); zm_debug_msg1("level out of range, desired level : ", level);
zm_debug_msg1("max level : ", N(firstep)); zm_debug_msg1("max level : ", ARRAY_SIZE(firstep));
return FALSE; return FALSE;
} }
zfDelayWriteInternalReg(dev, AR_PHY_FIND_SIG, zfDelayWriteInternalReg(dev, AR_PHY_FIND_SIG,
...@@ -283,10 +280,10 @@ u8_t zfHpAniControl(zdev_t *dev, ZM_HAL_ANI_CMD cmd, int param) ...@@ -283,10 +280,10 @@ u8_t zfHpAniControl(zdev_t *dev, ZM_HAL_ANI_CMD cmd, int param)
const TABLE cycpwrThr1 = { 2, 4, 6, 8, 10, 12, 14, 16 }; const TABLE cycpwrThr1 = { 2, 4, 6, 8, 10, 12, 14, 16 };
u32_t level = param; u32_t level = param;
if (level >= N(cycpwrThr1)) if (level >= ARRAY_SIZE(cycpwrThr1))
{ {
zm_debug_msg1("level out of range, desired level : ", level); zm_debug_msg1("level out of range, desired level : ", level);
zm_debug_msg1("max level : ", N(cycpwrThr1)); zm_debug_msg1("max level : ", ARRAY_SIZE(cycpwrThr1));
return FALSE; return FALSE;
} }
zfDelayWriteInternalReg(dev, AR_PHY_TIMING5, zfDelayWriteInternalReg(dev, AR_PHY_TIMING5,
...@@ -335,7 +332,6 @@ u8_t zfHpAniControl(zdev_t *dev, ZM_HAL_ANI_CMD cmd, int param) ...@@ -335,7 +332,6 @@ u8_t zfHpAniControl(zdev_t *dev, ZM_HAL_ANI_CMD cmd, int param)
return FALSE; return FALSE;
} }
return TRUE; return TRUE;
#undef N
} }
void zfHpAniRestart(zdev_t* dev) void zfHpAniRestart(zdev_t* dev)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment