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 2/2] OSS: Use ARRAY_SIZE macro when appropriate
    From
    Hi all,

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

    Signed-off-by: Ahmed S. Darwish <darwish.07@gmail.com>
    ---
    I couldn't compile-test this patch with `allyesconfig' or `allmodconfig'.

    au1550_ac97.c | 4 ++--
    nec_vrc5477.c | 4 ++--
    swarm_cs4297a.c | 3 ++-
    3 files changed, 6 insertions(+), 5 deletions(-)

    diff --git a/sound/oss/au1550_ac97.c b/sound/oss/au1550_ac97.c
    index 2197951..a339f0c 100644
    --- a/sound/oss/au1550_ac97.c
    +++ b/sound/oss/au1550_ac97.c
    @@ -1354,11 +1354,11 @@ au1550_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
    ((file->f_mode & FMODE_READ) && s->dma_adc.mapped);

    #ifdef DEBUG
    - for (count=0; count<sizeof(ioctl_str)/sizeof(ioctl_str[0]); count++) {
    + for (count = 0; count < ARRAY_SIZE(ioctl_str); count++) {
    if (ioctl_str[count].cmd == cmd)
    break;
    }
    - if (count < sizeof(ioctl_str) / sizeof(ioctl_str[0]))
    + if (count < ARRAY_SIZE(ioctl_str))
    pr_debug("ioctl %s, arg=0x%lxn", ioctl_str[count].str, arg);
    else
    pr_debug("ioctl 0x%x unknown, arg=0x%lx\n", cmd, arg);
    diff --git a/sound/oss/nec_vrc5477.c b/sound/oss/nec_vrc5477.c
    index da9728e..d459bdb 100644
    --- a/sound/oss/nec_vrc5477.c
    +++ b/sound/oss/nec_vrc5477.c
    @@ -1381,11 +1381,11 @@ static int vrc5477_ac97_ioctl(struct inode *inode, struct file *file,
    int val, ret;

    #ifdef VRC5477_AC97_DEBUG
    - for (count=0; count<sizeof(ioctl_str)/sizeof(ioctl_str[0]); count++) {
    + for (count = 0; count < ARRAY_SIZE(ioctl_str); count++) {
    if (ioctl_str[count].cmd == cmd)
    break;
    }
    - if (count < sizeof(ioctl_str)/sizeof(ioctl_str[0]))
    + if (count < ARRAY_SIZE(ioctl_str))
    printk(KERN_INFO PFX "ioctl %s\n", ioctl_str[count].str);
    else
    printk(KERN_INFO PFX "ioctl unknown, 0x%x\n", cmd);
    diff --git a/sound/oss/swarm_cs4297a.c b/sound/oss/swarm_cs4297a.c
    index 471c274..9f7e5f5 100644
    --- a/sound/oss/swarm_cs4297a.c
    +++ b/sound/oss/swarm_cs4297a.c
    @@ -77,6 +77,7 @@
    #include <linux/poll.h>
    #include <linux/smp_lock.h>
    #include <linux/mutex.h>
    +#include <linux/kernel.h>

    #include <asm/byteorder.h>
    #include <asm/dma.h>
    @@ -2676,7 +2677,7 @@ static int __init cs4297a_init(void)
    #if 0
    val = SOUND_MASK_LINE;
    mixer_ioctl(s, SOUND_MIXER_WRITE_RECSRC, (unsigned long) &val);
    - for (i = 0; i < sizeof(initvol) / sizeof(initvol[0]); i++) {
    + for (i = 0; i < ARRAY_SIZE(initvol); i++) {
    val = initvol[i].vol;
    mixer_ioctl(s, initvol[i].mixch, (unsigned long) &val);
    }
    --
    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.027 / U:0.024 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site