V4L/DVB (5090): Pvrusb2: A patch to use ARRAY_SIZE macro when appropriate

Signed-off-by: Ahmed S. Darwish <darwish.07@gmail.com>
Signed-off-by: Mike Isely <isely@pobox.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

1 files changed, 9 insertions, 16 deletions

diff --git a/drivers/media/video/pvrusb2/pvrusb2-std.c b/drivers/media/video/pvrusb2/pvrusb2-std.c
index c08925557ed4..30cceef0b169 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-std.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-std.c
@@ -141,10 +141,8 @@ int pvr2_std_str_to_id(v4l2_std_id *idPtr,const char *bufPtr,
                         cnt = 0;
                         while ((cnt < bufSize) && (bufPtr[cnt] != '-')) cnt++;
                         if (cnt >= bufSize) return 0; // No more characters
-                        sp = find_std_name(
-                                std_groups,
-                                sizeof(std_groups)/sizeof(std_groups[0]),
-                                bufPtr,cnt);
+                        sp = find_std_name(std_groups, ARRAY_SIZE(std_groups),
+                                           bufPtr,cnt);
                         if (!sp) return 0; // Illegal color system name
                         cnt++;
                         bufPtr += cnt;
@@ -163,8 +161,7 @@ int pvr2_std_str_to_id(v4l2_std_id *idPtr,const char *bufPtr,
                         if (ch == '/') break;
                         cnt++;
                 }
-                sp = find_std_name(std_items,
-                                   sizeof(std_items)/sizeof(std_items[0]),
+                sp = find_std_name(std_items, ARRAY_SIZE(std_items),
                                    bufPtr,cnt);
                 if (!sp) return 0; // Illegal modulation system ID
                 t = sp->id & cmsk;
@@ -189,14 +186,10 @@ unsigned int pvr2_std_id_to_str(char *bufPtr, unsigned int bufSize,
         unsigned int c1,c2;
         cfl = 0;
         c1 = 0;
-        for (idx1 = 0;
-             idx1 < sizeof(std_groups)/sizeof(std_groups[0]);
-             idx1++) {
+        for (idx1 = 0; idx1 < ARRAY_SIZE(std_groups); idx1++) {
                 gp = std_groups + idx1;
                 gfl = 0;
-                for (idx2 = 0;
-                     idx2 < sizeof(std_items)/sizeof(std_items[0]);
-                     idx2++) {
+                for (idx2 = 0; idx2 < ARRAY_SIZE(std_items); idx2++) {
                         ip = std_items + idx2;
                         if (!(gp->id & ip->id & id)) continue;
                         if (!gfl) {
@@ -279,7 +272,7 @@ static struct v4l2_standard generic_standards[] = {
         }
 };
 
-#define generic_standards_cnt (sizeof(generic_standards)/sizeof(generic_standards[0]))
+#define generic_standards_cnt ARRAY_SIZE(generic_standards)
 
 static struct v4l2_standard *match_std(v4l2_std_id id)
 {
@@ -348,7 +341,7 @@ struct v4l2_standard *pvr2_std_create_enum(unsigned int *countptr,
                 fmsk |= idmsk;
         }
 
-        for (idx2 = 0; idx2 < sizeof(std_mixes)/sizeof(std_mixes[0]); idx2++) {
+        for (idx2 = 0; idx2 < ARRAY_SIZE(std_mixes); idx2++) {
                 if ((id & std_mixes[idx2]) == std_mixes[idx2]) std_cnt++;
         }
 
@@ -374,8 +367,8 @@ struct v4l2_standard *pvr2_std_create_enum(unsigned int *countptr,
         idx = 0;
 
         /* Enumerate potential special cases */
-        for (idx2 = 0; ((idx2 < sizeof(std_mixes)/sizeof(std_mixes[0])) &&
-                        (idx < std_cnt)); idx2++) {
+        for (idx2 = 0; (idx2 < ARRAY_SIZE(std_mixes)) && (idx < std_cnt);
+             idx2++) {
                 if (!(id & std_mixes[idx2])) continue;
                 if (pvr2_std_fill(stddefs+idx,std_mixes[idx2])) idx++;
         }