media: pvrusb2: Remove unused pvr2_std_create_enum

pvr2_std_create_enum() has been unused since 2012's
commit c0bb609fdc0b ("[media] pvrusb2: Get rid of obsolete code for video
standard enumeration")

Remove it.

Signed-off-by: Dr. David Alan Gilbert <linux@treblig.org>
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>

diff --git a/drivers/media/usb/pvrusb2/pvrusb2-std.c b/drivers/media/usb/pvrusb2/pvrusb2-std.c
index e7ab41401577fc0df6ddac594bf02db78f6ed0b5..81c994e622416160e1e510a8a838efbd926bfadc 100644 (file)
--- a/drivers/media/usb/pvrusb2/pvrusb2-std.c
+++ b/drivers/media/usb/pvrusb2/pvrusb2-std.c
@@ -212,173 +212,6 @@ unsigned int pvr2_std_id_to_str(char *bufPtr, unsigned int bufSize,
 }
 
 
-// Template data for possible enumerated video standards.  Here we group
-// standards which share common frame rates and resolution.
-static struct v4l2_standard generic_standards[] = {
-       {
-               .id             = (TSTD_B|TSTD_B1|
-                                  TSTD_D|TSTD_D1|
-                                  TSTD_G|
-                                  TSTD_H|
-                                  TSTD_I|
-                                  TSTD_K|TSTD_K1|
-                                  TSTD_L|
-                                  V4L2_STD_SECAM_LC |
-                                  TSTD_N|TSTD_Nc),
-               .frameperiod    =
-               {
-                       .numerator  = 1,
-                       .denominator= 25
-               },
-               .framelines     = 625,
-               .reserved       = {0,0,0,0}
-       }, {
-               .id             = (TSTD_M|
-                                  V4L2_STD_NTSC_M_JP|
-                                  V4L2_STD_NTSC_M_KR),
-               .frameperiod    =
-               {
-                       .numerator  = 1001,
-                       .denominator= 30000
-               },
-               .framelines     = 525,
-               .reserved       = {0,0,0,0}
-       }, { // This is a total wild guess
-               .id             = (TSTD_60),
-               .frameperiod    =
-               {
-                       .numerator  = 1001,
-                       .denominator= 30000
-               },
-               .framelines     = 525,
-               .reserved       = {0,0,0,0}
-       }, { // This is total wild guess
-               .id             = V4L2_STD_NTSC_443,
-               .frameperiod    =
-               {
-                       .numerator  = 1001,
-                       .denominator= 30000
-               },
-               .framelines     = 525,
-               .reserved       = {0,0,0,0}
-       }
-};
-
-static struct v4l2_standard *match_std(v4l2_std_id id)
-{
-       unsigned int idx;
-       for (idx = 0; idx < ARRAY_SIZE(generic_standards); idx++) {
-               if (generic_standards[idx].id & id) {
-                       return generic_standards + idx;
-               }
-       }
-       return NULL;
-}
-
-static int pvr2_std_fill(struct v4l2_standard *std,v4l2_std_id id)
-{
-       struct v4l2_standard *template;
-       int idx;
-       unsigned int bcnt;
-       template = match_std(id);
-       if (!template) return 0;
-       idx = std->index;
-       memcpy(std,template,sizeof(*template));
-       std->index = idx;
-       std->id = id;
-       bcnt = pvr2_std_id_to_str(std->name,sizeof(std->name)-1,id);
-       std->name[bcnt] = 0;
-       pvr2_trace(PVR2_TRACE_STD,"Set up standard idx=%u name=%s",
-                  std->index,std->name);
-       return !0;
-}
-
-/* These are special cases of combined standards that we should enumerate
-   separately if the component pieces are present. */
-static v4l2_std_id std_mixes[] = {
-       V4L2_STD_PAL_B | V4L2_STD_PAL_G,
-       V4L2_STD_PAL_D | V4L2_STD_PAL_K,
-       V4L2_STD_SECAM_B | V4L2_STD_SECAM_G,
-       V4L2_STD_SECAM_D | V4L2_STD_SECAM_K,
-};
-
-struct v4l2_standard *pvr2_std_create_enum(unsigned int *countptr,
-                                          v4l2_std_id id)
-{
-       unsigned int std_cnt = 0;
-       unsigned int idx,bcnt,idx2;
-       v4l2_std_id idmsk,cmsk,fmsk;
-       struct v4l2_standard *stddefs;
-
-       if (pvrusb2_debug & PVR2_TRACE_STD) {
-               char buf[100];
-               bcnt = pvr2_std_id_to_str(buf,sizeof(buf),id);
-               pvr2_trace(
-                       PVR2_TRACE_STD,"Mapping standards mask=0x%x (%.*s)",
-                       (int)id,bcnt,buf);
-       }
-
-       *countptr = 0;
-       std_cnt = 0;
-       fmsk = 0;
-       for (idmsk = 1, cmsk = id; cmsk; idmsk <<= 1) {
-               if (!(idmsk & cmsk)) continue;
-               cmsk &= ~idmsk;
-               if (match_std(idmsk)) {
-                       std_cnt++;
-                       continue;
-               }
-               fmsk |= idmsk;
-       }
-
-       for (idx2 = 0; idx2 < ARRAY_SIZE(std_mixes); idx2++) {
-               if ((id & std_mixes[idx2]) == std_mixes[idx2]) std_cnt++;
-       }
-
-       /* Don't complain about ATSC standard values */
-       fmsk &= ~CSTD_ATSC;
-
-       if (fmsk) {
-               char buf[100];
-               bcnt = pvr2_std_id_to_str(buf,sizeof(buf),fmsk);
-               pvr2_trace(
-                       PVR2_TRACE_ERROR_LEGS,
-                       "***WARNING*** Failed to classify the following standard(s): %.*s",
-                       bcnt,buf);
-       }
-
-       pvr2_trace(PVR2_TRACE_STD,"Setting up %u unique standard(s)",
-                  std_cnt);
-       if (!std_cnt) return NULL; // paranoia
-
-       stddefs = kcalloc(std_cnt, sizeof(struct v4l2_standard),
-                         GFP_KERNEL);
-       if (!stddefs)
-               return NULL;
-
-       for (idx = 0; idx < std_cnt; idx++)
-               stddefs[idx].index = idx;
-
-       idx = 0;
-
-       /* Enumerate potential special cases */
-       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++;
-       }
-       /* Now enumerate individual pieces */
-       for (idmsk = 1, cmsk = id; cmsk && (idx < std_cnt); idmsk <<= 1) {
-               if (!(idmsk & cmsk)) continue;
-               cmsk &= ~idmsk;
-               if (!pvr2_std_fill(stddefs+idx,idmsk)) continue;
-               idx++;
-       }
-
-       *countptr = std_cnt;
-       return stddefs;
-}
-
 v4l2_std_id pvr2_std_get_usable(void)
 {
        return CSTD_ALL;

diff --git a/drivers/media/usb/pvrusb2/pvrusb2-std.h b/drivers/media/usb/pvrusb2/pvrusb2-std.h
index d8b4c6dc72fecb548c2cce01580a7a8566ed676a..74b05ecb97089ad2e6f97b5d8cf7ce4e1f528407 100644 (file)
--- a/drivers/media/usb/pvrusb2/pvrusb2-std.h
+++ b/drivers/media/usb/pvrusb2/pvrusb2-std.h
@@ -23,12 +23,6 @@ int pvr2_std_str_to_id(v4l2_std_id *idPtr,const char *bufPtr,
 unsigned int pvr2_std_id_to_str(char *bufPtr, unsigned int bufSize,
                                v4l2_std_id id);
 
-// Create an array of suitable v4l2_standard structures given a bit mask of
-// video standards to support.  The array is allocated from the heap, and
-// the number of elements is returned in the first argument.
-struct v4l2_standard *pvr2_std_create_enum(unsigned int *countptr,
-                                          v4l2_std_id id);
-
 // Return mask of which video standard bits are valid
 v4l2_std_id pvr2_std_get_usable(void);