FGCOM/dahdi-linux
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wct4xxp: Trivial. Use ARRAY_SIZE in free_wc() and __handle_leds().

Browse Source 
Reduces the amount of code to read in the two functions and fixes
checkpatch.pl warnings.

Signed-off-by: Shaun Ruffell <sruffell@digium.com>
Acked-by: Michael Spiceland <mspiceland@digium.com>
Acked-by: Russ Meyerriecks <rmeyerriecks@digium.com>

git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@10249 a0bf4364-ded3-4de4-8d8a-66a801d63aff
This commit is contained in:
Shaun Ruffell
2011-10-20 20:53:22 +00:00
parent b7485aa383
commit 955641b52c
1 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/dahdi/wct4xxp/base.c
View File

@@ -3081,7 +3081,7 @@ static inline void __handle_leds(struct t4 *wc)
if (wc->blinktimer == 0xf) {
wc->blinktimer = -1;
wc->alarmpos++;
if (wc->alarmpos >= (sizeof(altab) / sizeof(altab[0])))
if (wc->alarmpos >= ARRAY_SIZE(altab))
wc->alarmpos = 0;
}
#else
@@ -4044,17 +4044,12 @@ static void free_wc(struct t4 *wc)
{
unsigned int x, y;
for (x = 0; x < sizeof(wc->tspans)/sizeof(wc->tspans[0]); x++) {
if (!wc->tspans[x]) {
for (x = 0; x < ARRAY_SIZE(wc->tspans); x++) {
if (!wc->tspans[x])
continue;
}
for (y = 0; y < sizeof(wc->tspans[x]->chans)/sizeof(wc->tspans[x]->chans[0]); y++) {
if (wc->tspans[x]->chans[y]) {
kfree(wc->tspans[x]->chans[y]);
}
if (wc->tspans[x]->ec[y])
kfree(wc->tspans[x]->ec[y]);
for (y = 0; y < ARRAY_SIZE(wc->tspans[x]->chans); y++) {
kfree(wc->tspans[x]->chans[y]);
kfree(wc->tspans[x]->ec[y]);
}
kfree(wc->tspans[x]);
}