6 files changed, 13 insertions, 21 deletions

diff --git a/drivers/media/video/pvrusb2/pvrusb2-audio.c b/drivers/media/video/pvrusb2/pvrusb2-audio.c
index 7e61d4a17846..a45ede0a8cf1 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-audio.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-audio.c
@@ -98,8 +98,7 @@ static int msp3400_check(struct pvr2_msp3400_handler *ctxt)
         unsigned long msk;
         unsigned int idx;
 
-        for (idx = 0; idx < sizeof(msp3400_ops)/sizeof(msp3400_ops[0]);
-             idx++) {
+        for (idx = 0; idx < ARRAY_SIZE(msp3400_ops); idx++) {
                 msk = 1 << idx;
                 if (ctxt->stale_mask & msk) continue;
                 if (msp3400_ops[idx].check(ctxt)) {
@@ -115,8 +114,7 @@ static void msp3400_update(struct pvr2_msp3400_handler *ctxt)
         unsigned long msk;
         unsigned int idx;
 
-        for (idx = 0; idx < sizeof(msp3400_ops)/sizeof(msp3400_ops[0]);
-             idx++) {
+        for (idx = 0; idx < ARRAY_SIZE(msp3400_ops); idx++) {
                 msk = 1 << idx;
                 if (!(ctxt->stale_mask & msk)) continue;
                 ctxt->stale_mask &= ~msk;
@@ -159,8 +157,7 @@ int pvr2_i2c_msp3400_setup(struct pvr2_hdw *hdw,struct pvr2_i2c_client *cp)
         ctxt->i2c_handler.func_table = &msp3400_funcs;
         ctxt->client = cp;
         ctxt->hdw = hdw;
-        ctxt->stale_mask = (1 << (sizeof(msp3400_ops)/
-                                  sizeof(msp3400_ops[0]))) - 1;
+        ctxt->stale_mask = (1 << ARRAY_SIZE(msp3400_ops)) - 1;
         cp->handler = &ctxt->i2c_handler;
         pvr2_trace(PVR2_TRACE_CHIPS,"i2c 0x%x msp3400 V4L2 handler set up",
                    cp->client->addr);
diff --git a/drivers/media/video/pvrusb2/pvrusb2-ctrl.c b/drivers/media/video/pvrusb2/pvrusb2-ctrl.c
index f8f4e2f311ab..f569b00201dd 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-ctrl.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-ctrl.c
@@ -515,9 +515,8 @@ int pvr2_ctrl_sym_to_value(struct pvr2_ctrl *cptr,
                         }
                         if (maskptr) *maskptr = ~0;
                 } else if (cptr->info->type == pvr2_ctl_bool) {
-                        ret = parse_token(
-                                ptr,len,valptr,boolNames,
-                                sizeof(boolNames)/sizeof(boolNames[0]));
+                        ret = parse_token(ptr,len,valptr,boolNames,
+                                          ARRAY_SIZE(boolNames));
                         if (ret == 1) {
                                 *valptr = *valptr ? !0 : 0;
                         } else if (ret == 0) {
diff --git a/drivers/media/video/pvrusb2/pvrusb2-cx2584x-v4l.c b/drivers/media/video/pvrusb2/pvrusb2-cx2584x-v4l.c
index 851099a85e5a..e8a9252c7df6 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-cx2584x-v4l.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-cx2584x-v4l.c
@@ -150,8 +150,7 @@ static int decoder_check(struct pvr2_v4l_cx2584x *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)) {
@@ -167,8 +166,7 @@ static void decoder_update(struct pvr2_v4l_cx2584x *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;
@@ -242,8 +240,7 @@ int pvr2_i2c_cx2584x_v4l_setup(struct pvr2_hdw *hdw,
         ctxt->ctrl.force_reset = (void (*)(void*))decoder_reset;
         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;
         {
diff --git a/drivers/media/video/pvrusb2/pvrusb2-debugifc.c b/drivers/media/video/pvrusb2/pvrusb2-debugifc.c
index f985f00d885a..e9da9bb8f8de 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-debugifc.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-debugifc.c
@@ -152,7 +152,7 @@ static unsigned long debugifc_find_mask(const char *buf,unsigned int count)
 {
         struct debugifc_mask_item *mip;
         unsigned int idx;
-        for (idx = 0; idx < sizeof(mask_items)/sizeof(mask_items[0]); idx++) {
+        for (idx = 0; idx < ARRAY_SIZE(mask_items); idx++) {
                 mip = mask_items + idx;
                 if (debugifc_match_keyword(buf,count,mip->name)) {
                         return mip->msk;
@@ -169,7 +169,7 @@ static int debugifc_print_mask(char *buf,unsigned int sz,
         unsigned int idx;
         int bcnt = 0;
         int ccnt;
-        for (idx = 0; idx < sizeof(mask_items)/sizeof(mask_items[0]); idx++) {
+        for (idx = 0; idx < ARRAY_SIZE(mask_items); idx++) {
                 mip = mask_items + idx;
                 if (!(mip->msk & msk)) continue;
                 ccnt = scnprintf(buf,sz,"%s%c%s",
diff --git a/drivers/media/video/pvrusb2/pvrusb2-eeprom.c b/drivers/media/video/pvrusb2/pvrusb2-eeprom.c
index 6cff8e75f426..45cbca0143ca 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-eeprom.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-eeprom.c
@@ -102,9 +102,8 @@ static u8 *pvr2_eeprom_fetch(struct pvr2_hdw *hdw)
                 }
                 msg[1].len = pcnt;
                 msg[1].buf = eeprom+tcnt;
-                if ((ret = i2c_transfer(
-                             &hdw->i2c_adap,
-                             msg,sizeof(msg)/sizeof(msg[0]))) != 2) {
+                if ((ret = i2c_transfer(&hdw->i2c_adap,
+                                        msg,ARRAY_SIZE(msg))) != 2) {
                         pvr2_trace(PVR2_TRACE_ERROR_LEGS,
                                    "eeprom fetch set offs err=%d",ret);
                         kfree(eeprom);
diff --git a/drivers/media/video/pvrusb2/pvrusb2-hdw.c b/drivers/media/video/pvrusb2/pvrusb2-hdw.c
index 7f9168538245..5e166ed19fc5 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-hdw.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-hdw.c
@@ -723,7 +723,7 @@ static void ctrl_stdenumcur_clear_dirty(struct pvr2_ctrl *cptr)
 
 #define DEFENUM(tab) \
         .type = pvr2_ctl_enum, \
-        .def.type_enum.count = (sizeof(tab)/sizeof((tab)[0])), \
+        .def.type_enum.count = ARRAY_SIZE(tab), \
         .def.type_enum.value_names = tab
 
 #define DEFBOOL \