drivers/net/wireless/ath9k/rc.c: use ARRAY_SIZE
authorJulia Lawall <julia@diku.dk>
Sun, 9 Nov 2008 16:56:10 +0000 (17:56 +0100)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 21 Nov 2008 16:08:16 +0000 (11:08 -0500)
ARRAY_SIZE is more concise to use when the size of an array is divided by
the size of its type or the size of its first element.

The semantic patch that makes this change is as follows:
(http://www.emn.fr/x-info/coccinelle/)

// <smpl>
@i@
@@

#include <linux/kernel.h>

@depends on i using "paren.iso"@
type T;
T[] E;
@@

- (sizeof(E)/sizeof(E[...]))
+ ARRAY_SIZE(E)
// </smpl>

Signed-off-by: Julia Lawall <julia@diku.dk>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/ath9k/rc.c

index aa6bfd717c2055693ebd2635ef95aca5dcae7639..517992d14808c8f30ef83f350cb529b978d4ffff 100644 (file)
@@ -1272,8 +1272,7 @@ static void ath_rc_update_ht(struct ath_softc *sc,
                                rate_ctrl->state[tx_rate].per = 100;
                } else {
                        /* xretries == 2 */
-                       count = sizeof(nretry_to_per_lookup) /
-                               sizeof(nretry_to_per_lookup[0]);
+                       count = ARRAY_SIZE(nretry_to_per_lookup);
                        if (retries >= count)
                                retries = count - 1;
                        /* new_PER = 7/8*old_PER + 1/8*(currentPER) */
@@ -1291,8 +1290,7 @@ static void ath_rc_update_ht(struct ath_softc *sc,
        } else {        /* xretries == 0 */
                /* Update the PER. */
                /* Make sure it doesn't index out of array's bounds. */
-               count = sizeof(nretry_to_per_lookup) /
-                       sizeof(nretry_to_per_lookup[0]);
+               count = ARRAY_SIZE(nretry_to_per_lookup);
                if (retries >= count)
                        retries = count - 1;
                if (info_priv->n_bad_frames) {