Commit 19ebeff1 authored by Kulikov Vasiliy's avatar Kulikov Vasiliy Committed by Greg Kroah-Hartman
Browse files

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 3d63a492

drivers/staging/otus/hal/hpmain.c

+10 −18
Original line number Original line Diff line number Diff line
@@ -430,7 +430,7 @@ void zfInitPhy(zdev_t* dev, u32_t frequency, u8_t bw40) 
     * Register setting by mode

     * Register setting by mode

     */

     */





    entries = sizeof(ar5416Modes) / sizeof(*ar5416Modes);

    entries = ARRAY_SIZE(ar5416Modes);

    zm_msg1_scan(ZM_LV_2, "Modes register setting entries=", entries);

    zm_msg1_scan(ZM_LV_2, "Modes register setting entries=", entries);

    for (i=0; i<entries; i++)

    for (i=0; i<entries; i++)

    {

    {
@@ -496,7 +496,7 @@ void zfInitPhy(zdev_t* dev, u32_t frequency, u8_t bw40) 
    /*

    /*

     * Common Register setting

     * Common Register setting

     */

     */

    entries = sizeof(ar5416Common) / sizeof(*ar5416Common);

    entries = ARRAY_SIZE(ar5416Common);

    for (i=0; i<entries; i++)

    for (i=0; i<entries; i++)

    {

    {

        reg_write(ar5416Common[i][0], ar5416Common[i][1]);

        reg_write(ar5416Common[i][0], ar5416Common[i][1]);
@@ -506,7 +506,7 @@ void zfInitPhy(zdev_t* dev, u32_t frequency, u8_t bw40) 
    /*

    /*

     * RF Gain setting by freqIndex

     * RF Gain setting by freqIndex

     */

     */

    entries = sizeof(ar5416BB_RfGain) / sizeof(*ar5416BB_RfGain);

    entries = ARRAY_SIZE(ar5416BB_RfGain);

    for (i=0; i<entries; i++)

    for (i=0; i<entries; i++)

    {

    {

        reg_write(ar5416BB_RfGain[i][0], ar5416BB_RfGain[i][freqIndex]);

        reg_write(ar5416BB_RfGain[i][0], ar5416BB_RfGain[i][freqIndex]);
@@ -963,7 +963,6 @@ u32_t reverse_bits(u32_t chan_sel) 
/* Bank 0 1 2 3 5 6 7 */

/* Bank 0 1 2 3 5 6 7 */

void zfSetRfRegs(zdev_t* dev, u32_t frequency)

void zfSetRfRegs(zdev_t* dev, u32_t frequency)

{

{

    u16_t entries;

    u16_t freqIndex = 0;

    u16_t freqIndex = 0;

    u16_t i;

    u16_t i;
@@ -984,33 +983,28 @@ void zfSetRfRegs(zdev_t* dev, u32_t frequency) 
    }

    }





#if 1

#if 1

    entries = sizeof(otusBank) / sizeof(*otusBank);

    for (i=0; i<ARRAY_SIZE(otusBank); i++)

    for (i=0; i<entries; i++)

    {

    {

        reg_write(otusBank[i][0], otusBank[i][freqIndex]);

        reg_write(otusBank[i][0], otusBank[i][freqIndex]);

    }

    }

#else

#else

    /* Bank0 */

    /* Bank0 */

    entries = sizeof(ar5416Bank0) / sizeof(*ar5416Bank0);

    for (i=0; i<ARRAY_SIZE(ar5416Bank0); i++)

    for (i=0; i<entries; i++)

    {

    {

        reg_write(ar5416Bank0[i][0], ar5416Bank0[i][1]);

        reg_write(ar5416Bank0[i][0], ar5416Bank0[i][1]);

    }

    }

    /* Bank1 */

    /* Bank1 */

    entries = sizeof(ar5416Bank1) / sizeof(*ar5416Bank1);

    for (i=0; i<ARRAY_SIZE(ar5416Bank1); i++)

    for (i=0; i<entries; i++)

    {

    {

        reg_write(ar5416Bank1[i][0], ar5416Bank1[i][1]);

        reg_write(ar5416Bank1[i][0], ar5416Bank1[i][1]);

    }

    }

    /* Bank2 */

    /* Bank2 */

    entries = sizeof(ar5416Bank2) / sizeof(*ar5416Bank2);

    for (i=0; i<ARRAY_SIZE(ar5416Bank2); i++)

    for (i=0; i<entries; i++)

    {

    {

        reg_write(ar5416Bank2[i][0], ar5416Bank2[i][1]);

        reg_write(ar5416Bank2[i][0], ar5416Bank2[i][1]);

    }

    }

    /* Bank3 */

    /* Bank3 */

    entries = sizeof(ar5416Bank3) / sizeof(*ar5416Bank3);

    for (i=0; i<ARRAY_SIZE(ar5416Bank3); i++)

    for (i=0; i<entries; i++)

    {

    {

        reg_write(ar5416Bank3[i][0], ar5416Bank3[i][freqIndex]);

        reg_write(ar5416Bank3[i][0], ar5416Bank3[i][freqIndex]);

    }

    }
@@ -1018,14 +1012,12 @@ void zfSetRfRegs(zdev_t* dev, u32_t frequency) 
    reg_write (0x98b0,  0x00000013);

    reg_write (0x98b0,  0x00000013);

    reg_write (0x98e4,  0x00000002);

    reg_write (0x98e4,  0x00000002);

    /* Bank6 */

    /* Bank6 */

    entries = sizeof(ar5416Bank6) / sizeof(*ar5416Bank6);

    for (i=0; i<ARRAY_SIZE(ar5416Bank6); i++)

    for (i=0; i<entries; i++)

    {

    {

        reg_write(ar5416Bank6[i][0], ar5416Bank6[i][freqIndex]);

        reg_write(ar5416Bank6[i][0], ar5416Bank6[i][freqIndex]);

    }

    }

    /* Bank7 */

    /* Bank7 */

    entries = sizeof(ar5416Bank7) / sizeof(*ar5416Bank7);

    for (i=0; i<ARRAY_SIZE(ar5416Bank7); i++)

    for (i=0; i<entries; i++)

    {

    {

        reg_write(ar5416Bank7[i][0], ar5416Bank7[i][1]);

        reg_write(ar5416Bank7[i][0], ar5416Bank7[i][1]);

    }

    }