lkml.org 
[lkml]   [2007]   [Feb]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    Subject[PATCH 2.6.20] atm: Use ARRAY_SIZE macro when appropriate
    From
    Hi all,

    A patch to use ARRAY_SIZE macro already defined in kernel.h for ATM
    drivers.

    Signed-off-by: Ahmed S. Darwish <darwish.07@gmail.com>
    ---
    diff --git a/drivers/atm/he.c b/drivers/atm/he.c
    index db33f6f..8510026 100644
    --- a/drivers/atm/he.c
    +++ b/drivers/atm/he.c
    @@ -3017,7 +3017,7 @@ read_prom_byte(struct he_dev *he_dev, int addr)
    he_writel(he_dev, val, HOST_CNTL);

    /* Send READ instruction */
    - for (i = 0; i < sizeof(readtab)/sizeof(readtab[0]); i++) {
    + for (i = 0; i < ARRAY_SIZE(readtab); i++) {
    he_writel(he_dev, val | readtab[i], HOST_CNTL);
    udelay(EEPROM_DELAY);
    }
    diff --git a/drivers/atm/idt77252.c b/drivers/atm/idt77252.c
    index f407861..b4b8014 100644
    --- a/drivers/atm/idt77252.c
    +++ b/drivers/atm/idt77252.c
    @@ -388,7 +388,7 @@ idt77252_eeprom_read_status(struct idt77252_dev *card)

    gp = idt77252_read_gp(card) & ~(SAR_GP_EESCLK|SAR_GP_EECS|SAR_GP_EEDO);

    - for (i = 0; i < sizeof(rdsrtab)/sizeof(rdsrtab[0]); i++) {
    + for (i = 0; i < ARRAY_SIZE(rdsrtab); i++) {
    idt77252_write_gp(card, gp | rdsrtab[i]);
    udelay(5);
    }
    @@ -422,7 +422,7 @@ idt77252_eeprom_read_byte(struct idt77252_dev *card, u8 offset)

    gp = idt77252_read_gp(card) & ~(SAR_GP_EESCLK|SAR_GP_EECS|SAR_GP_EEDO);

    - for (i = 0; i < sizeof(rdtab)/sizeof(rdtab[0]); i++) {
    + for (i = 0; i < ARRAY_SIZE(rdtab); i++) {
    idt77252_write_gp(card, gp | rdtab[i]);
    udelay(5);
    }
    @@ -469,14 +469,14 @@ idt77252_eeprom_write_byte(struct idt77252_dev *card, u8 offset, u8 data)

    gp = idt77252_read_gp(card) & ~(SAR_GP_EESCLK|SAR_GP_EECS|SAR_GP_EEDO);

    - for (i = 0; i < sizeof(wrentab)/sizeof(wrentab[0]); i++) {
    + for (i = 0; i < ARRAY_SIZE(wrentab); i++) {
    idt77252_write_gp(card, gp | wrentab[i]);
    udelay(5);
    }
    idt77252_write_gp(card, gp | SAR_GP_EECS);
    udelay(5);

    - for (i = 0; i < sizeof(wrtab)/sizeof(wrtab[0]); i++) {
    + for (i = 0; i < ARRAY_SIZE(wrtab); i++) {
    idt77252_write_gp(card, gp | wrtab[i]);
    udelay(5);
    }
    diff --git a/drivers/atm/nicstarmac.c b/drivers/atm/nicstarmac.c
    index 2c5e3ae..480947f 100644
    --- a/drivers/atm/nicstarmac.c
    +++ b/drivers/atm/nicstarmac.c
    @@ -7,6 +7,8 @@
    * Read this ForeRunner's MAC address from eprom/eeprom
    */

    +#include <linux/kernel.h>
    +
    typedef void __iomem *virt_addr_t;

    #define CYCLE_DELAY 5
    @@ -176,7 +178,7 @@ read_eprom_byte(virt_addr_t base, u_int8_t offset)
    val = NICSTAR_REG_READ( base, NICSTAR_REG_GENERAL_PURPOSE ) & 0xFFFFFFF0;

    /* Send READ instruction */
    - for (i=0; i<sizeof readtab/sizeof readtab[0]; i++)
    + for (i=0; i<ARRAY_SIZE(readtab); i++)
    {
    NICSTAR_REG_WRITE( base, NICSTAR_REG_GENERAL_PURPOSE,
    (val | readtab[i]) );

    --
    Ahmed S. Darwish
    http://darwish-07.blogspot.com
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2007-02-06 17:11    [W:0.030 / U:29.596 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site