lkml.org 
[lkml]   [2007]   [Jan]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patches in this message
    /
    Date
    Subject[PATCH 2.6.20-rc5 4/4] pvrusb2: Use ARRAY_SIZE macro
    From
    Use ARRAY_SIZE macro in miscellaneous pvrusb2 files found

    Signed-off-by: Ahmed S. Darwish <darwish.07@gmail.com>
    ---
    This patch ofcourse don't include previous patches in the set. I've just
    included the remaining modifications in one patch/mail cause every file
    touched here has only one or two lines of changes.

    diff --git a/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c b/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c
    index f9bb41d..83df9ee 100644
    --- a/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c
    +++ b/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c
    @@ -948,8 +948,7 @@ static void do_i2c_scan(struct pvr2_hdw *hdw)
    printk("%s: i2c scan beginning\n",hdw->name);
    for (i = 0; i < 128; i++) {
    msg[0].addr = i;
    - rc = i2c_transfer(&hdw->i2c_adap,msg,
    - sizeof(msg)/sizeof(msg[0]));
    + rc = i2c_transfer(&hdw->i2c_adap,msg, ARRAY_SIZE(msg));
    if (rc != 1) continue;
    printk("%s: i2c scan: found device @ 0x%x\n",hdw->name,i);
    }
    diff --git a/drivers/media/video/pvrusb2/pvrusb2-sysfs.c b/drivers/media/video/pvrusb2/pvrusb2-sysfs.c
    index c294f46..17b5a3e 100644
    --- a/drivers/media/video/pvrusb2/pvrusb2-sysfs.c
    +++ b/drivers/media/video/pvrusb2/pvrusb2-sysfs.c
    @@ -491,7 +491,7 @@ static void pvr2_sysfs_add_control(struct pvr2_sysfs *sfp,int ctl_id)
    unsigned int cnt,acnt;
    int ret;

    - if ((ctl_id < 0) || (ctl_id >= (sizeof(funcs)/sizeof(funcs[0])))) {
    + if ((ctl_id < 0) || (ctl_id >= ARRAY_SIZE(funcs))) {
    return;
    }

    diff --git a/drivers/media/video/pvrusb2/pvrusb2-video-v4l.c b/drivers/media/video/pvrusb2/pvrusb2-video-v4l.c
    index 05f2cdd..b3eba8a 100644
    --- a/drivers/media/video/pvrusb2/pvrusb2-video-v4l.c
    +++ b/drivers/media/video/pvrusb2/pvrusb2-video-v4l.c
    @@ -137,8 +137,7 @@ static int decoder_check(struct pvr2_v4l_decoder *ctxt)
    unsigned long msk;
    unsigned int idx;

    - for (idx = 0; idx < sizeof(decoder_ops)/sizeof(decoder_ops[0]);
    - idx++) {
    + for (idx = 0; idx < ARRAY_SIZE(decoder_ops); idx++) {
    msk = 1 << idx;
    if (ctxt->stale_mask & msk) continue;
    if (decoder_ops[idx].check(ctxt)) {
    @@ -154,8 +153,7 @@ static void decoder_update(struct pvr2_v4l_decoder *ctxt)
    unsigned long msk;
    unsigned int idx;

    - for (idx = 0; idx < sizeof(decoder_ops)/sizeof(decoder_ops[0]);
    - idx++) {
    + for (idx = 0; idx < ARRAY_SIZE(decoder_ops); idx++) {
    msk = 1 << idx;
    if (!(ctxt->stale_mask & msk)) continue;
    ctxt->stale_mask &= ~msk;
    @@ -230,8 +228,7 @@ int pvr2_i2c_decoder_v4l_setup(struct pvr2_hdw *hdw,
    ctxt->ctrl.tuned = (int (*)(void *))decoder_is_tuned;
    ctxt->client = cp;
    ctxt->hdw = hdw;
    - ctxt->stale_mask = (1 << (sizeof(decoder_ops)/
    - sizeof(decoder_ops[0]))) - 1;
    + ctxt->stale_mask = (1 << ARRAY_SIZE(decoder_ops)) - 1;
    hdw->decoder_ctrl = &ctxt->ctrl;
    cp->handler = &ctxt->handler;
    pvr2_trace(PVR2_TRACE_CHIPS,"i2c 0x%x saa711x V4L2 handler set up",
    diff --git a/drivers/media/video/pvrusb2/pvrusb2-wm8775.c b/drivers/media/video/pvrusb2/pvrusb2-wm8775.c
    index 2413e51..3a29bb8 100644
    --- a/drivers/media/video/pvrusb2/pvrusb2-wm8775.c
    +++ b/drivers/media/video/pvrusb2/pvrusb2-wm8775.c
    @@ -99,8 +99,7 @@ static int wm8775_check(struct pvr2_v4l_wm8775 *ctxt)
    unsigned long msk;
    unsigned int idx;

    - for (idx = 0; idx < sizeof(wm8775_ops)/sizeof(wm8775_ops[0]);
    - idx++) {
    + for (idx = 0; idx < ARRAY_SIZE(wm8775_ops); idx++) {
    msk = 1 << idx;
    if (ctxt->stale_mask & msk) continue;
    if (wm8775_ops[idx].check(ctxt)) {
    @@ -116,8 +115,7 @@ static void wm8775_update(struct pvr2_v4l_wm8775 *ctxt)
    unsigned long msk;
    unsigned int idx;

    - for (idx = 0; idx < sizeof(wm8775_ops)/sizeof(wm8775_ops[0]);
    - idx++) {
    + for (idx = 0; idx < ARRAY_SIZE(wm8775_ops); idx++) {
    msk = 1 << idx;
    if (!(ctxt->stale_mask & msk)) continue;
    ctxt->stale_mask &= ~msk;
    @@ -148,8 +146,7 @@ int pvr2_i2c_wm8775_setup(struct pvr2_hdw *hdw,struct pvr2_i2c_client *cp)
    ctxt->handler.func_table = &hfuncs;
    ctxt->client = cp;
    ctxt->hdw = hdw;
    - ctxt->stale_mask = (1 << (sizeof(wm8775_ops)/
    - sizeof(wm8775_ops[0]))) - 1;
    + ctxt->stale_mask = (1 << ARRAY_SIZE(wm8775_ops)) - 1;
    cp->handler = &ctxt->handler;
    pvr2_trace(PVR2_TRACE_CHIPS,"i2c 0x%x wm8775 V4L2 handler set up",
    cp->client->addr);
    --
    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-01-16 10:15    [W:0.048 / U:0.024 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site