usb: gadget: uvc: configfs: Simplify attributes macros

Several macros used to define attributes and their access functions take
multiple arguments to specify endianness and string conversion
functions, based on the size of the attribute. This can be simplified by
passing the number of bits explicitly, and constructing the name of the
functions internally.

The UVCG_OPTS_ATTR macro can be simplified further as all fields it
deals with are unsigned int.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Paul Elder <paul.elder@ideasonboard.com>
Tested-by: Paul Elder <paul.elder@ideasonboard.com>

diff --git a/drivers/usb/gadget/function/uvc_configfs.c b/drivers/usb/gadget/function/uvc_configfs.c
index 522cb7b..36f8f03 100644 (file)
--- a/drivers/usb/gadget/function/uvc_configfs.c
+++ b/drivers/usb/gadget/function/uvc_configfs.c
@@ -38,6 +38,9 @@ static struct configfs_attribute prefix##attr_##cname = { \
        .show           = prefix##cname##_show,                         \
 }
 
+#define le8_to_cpu(x)  (x)
+#define cpu_to_le8(x)  (x)
+
 static int uvcg_config_compare_u32(const void *l, const void *r)
 {
        u32 li = *(const u32 *)l;
@@ -135,9 +138,9 @@ static struct uvcg_control_header *to_uvcg_control_header(struct config_item *it
        return container_of(item, struct uvcg_control_header, item);
 }
 
-#define UVCG_CTRL_HDR_ATTR(cname, aname, conv, str2u, uxx, vnoc, limit)        \
+#define UVCG_CTRL_HDR_ATTR(cname, aname, bits, limit)                  \
 static ssize_t uvcg_control_header_##cname##_show(                     \
-       struct config_item *item, char *page)                   \
+       struct config_item *item, char *page)                           \
 {                                                                      \
        struct uvcg_control_header *ch = to_uvcg_control_header(item);  \
        struct f_uvc_opts *opts;                                        \
@@ -151,7 +154,7 @@ static ssize_t uvcg_control_header_##cname##_show(                  \
        opts = to_f_uvc_opts(opts_item);                                \
                                                                        \
        mutex_lock(&opts->lock);                                        \
-       result = sprintf(page, "%d\n", conv(ch->desc.aname));           \
+       result = sprintf(page, "%d\n", le##bits##_to_cpu(ch->desc.aname));\
        mutex_unlock(&opts->lock);                                      \
                                                                        \
        mutex_unlock(su_mutex);                                         \
@@ -167,7 +170,7 @@ uvcg_control_header_##cname##_store(struct config_item *item,               \
        struct config_item *opts_item;                                  \
        struct mutex *su_mutex = &ch->item.ci_group->cg_subsys->su_mutex;\
        int ret;                                                        \
-       uxx num;                                                        \
+       u##bits num;                                                    \
                                                                        \
        mutex_lock(su_mutex); /* for navigating configfs hierarchy */   \
                                                                        \
@@ -180,7 +183,7 @@ uvcg_control_header_##cname##_store(struct config_item *item,               \
                goto end;                                               \
        }                                                               \
                                                                        \
-       ret = str2u(page, 0, &num);                                     \
+       ret = kstrtou##bits(page, 0, &num);                             \
        if (ret)                                                        \
                goto end;                                               \
                                                                        \
@@ -188,7 +191,7 @@ uvcg_control_header_##cname##_store(struct config_item *item,               \
                ret = -EINVAL;                                          \
                goto end;                                               \
        }                                                               \
-       ch->desc.aname = vnoc(num);                                     \
+       ch->desc.aname = cpu_to_le##bits(num);                          \
        ret = len;                                                      \
 end:                                                                   \
        mutex_unlock(&opts->lock);                                      \
@@ -198,11 +201,9 @@ end:                                                                       \
                                                                        \
 UVC_ATTR(uvcg_control_header_, cname, aname)
 
-UVCG_CTRL_HDR_ATTR(bcd_uvc, bcdUVC, le16_to_cpu, kstrtou16, u16, cpu_to_le16,
-                  0xffff);
+UVCG_CTRL_HDR_ATTR(bcd_uvc, bcdUVC, 16, 0xffff);
 
-UVCG_CTRL_HDR_ATTR(dw_clock_frequency, dwClockFrequency, le32_to_cpu, kstrtou32,
-                  u32, cpu_to_le32, 0x7fffffff);
+UVCG_CTRL_HDR_ATTR(dw_clock_frequency, dwClockFrequency, 32, 0x7fffffff);
 
 #undef UVCG_CTRL_HDR_ATTR
 
@@ -255,7 +256,7 @@ static const struct uvcg_config_group_type uvcg_control_header_grp_type = {
  * control/processing/default
  */
 
-#define UVCG_DEFAULT_PROCESSING_ATTR(cname, aname, conv)               \
+#define UVCG_DEFAULT_PROCESSING_ATTR(cname, aname, bits)               \
 static ssize_t uvcg_default_processing_##cname##_show(                 \
        struct config_item *item, char *page)                           \
 {                                                                      \
@@ -273,7 +274,7 @@ static ssize_t uvcg_default_processing_##cname##_show(                      \
        pd = &opts->uvc_processing;                                     \
                                                                        \
        mutex_lock(&opts->lock);                                        \
-       result = sprintf(page, "%d\n", conv(pd->aname));                \
+       result = sprintf(page, "%d\n", le##bits##_to_cpu(pd->aname));   \
        mutex_unlock(&opts->lock);                                      \
                                                                        \
        mutex_unlock(su_mutex);                                         \
@@ -282,14 +283,10 @@ static ssize_t uvcg_default_processing_##cname##_show(                    \
                                                                        \
 UVC_ATTR_RO(uvcg_default_processing_, cname, aname)
 
-#define identity_conv(x) (x)
-
-UVCG_DEFAULT_PROCESSING_ATTR(b_unit_id, bUnitID, identity_conv);
-UVCG_DEFAULT_PROCESSING_ATTR(b_source_id, bSourceID, identity_conv);
-UVCG_DEFAULT_PROCESSING_ATTR(w_max_multiplier, wMaxMultiplier, le16_to_cpu);
-UVCG_DEFAULT_PROCESSING_ATTR(i_processing, iProcessing, identity_conv);
-
-#undef identity_conv
+UVCG_DEFAULT_PROCESSING_ATTR(b_unit_id, bUnitID, 8);
+UVCG_DEFAULT_PROCESSING_ATTR(b_source_id, bSourceID, 8);
+UVCG_DEFAULT_PROCESSING_ATTR(w_max_multiplier, wMaxMultiplier, 16);
+UVCG_DEFAULT_PROCESSING_ATTR(i_processing, iProcessing, 8);
 
 #undef UVCG_DEFAULT_PROCESSING_ATTR
 
@@ -362,7 +359,7 @@ static const struct uvcg_config_group_type uvcg_processing_grp_type = {
  * control/terminal/camera/default
  */
 
-#define UVCG_DEFAULT_CAMERA_ATTR(cname, aname, conv)                   \
+#define UVCG_DEFAULT_CAMERA_ATTR(cname, aname, bits)                   \
 static ssize_t uvcg_default_camera_##cname##_show(                     \
        struct config_item *item, char *page)                           \
 {                                                                      \
@@ -381,7 +378,7 @@ static ssize_t uvcg_default_camera_##cname##_show(                  \
        cd = &opts->uvc_camera_terminal;                                \
                                                                        \
        mutex_lock(&opts->lock);                                        \
-       result = sprintf(page, "%d\n", conv(cd->aname));                \
+       result = sprintf(page, "%d\n", le##bits##_to_cpu(cd->aname));   \
        mutex_unlock(&opts->lock);                                      \
                                                                        \
        mutex_unlock(su_mutex);                                         \
@@ -391,20 +388,16 @@ static ssize_t uvcg_default_camera_##cname##_show(                        \
                                                                        \
 UVC_ATTR_RO(uvcg_default_camera_, cname, aname)
 
-#define identity_conv(x) (x)
-
-UVCG_DEFAULT_CAMERA_ATTR(b_terminal_id, bTerminalID, identity_conv);
-UVCG_DEFAULT_CAMERA_ATTR(w_terminal_type, wTerminalType, le16_to_cpu);
-UVCG_DEFAULT_CAMERA_ATTR(b_assoc_terminal, bAssocTerminal, identity_conv);
-UVCG_DEFAULT_CAMERA_ATTR(i_terminal, iTerminal, identity_conv);
+UVCG_DEFAULT_CAMERA_ATTR(b_terminal_id, bTerminalID, 8);
+UVCG_DEFAULT_CAMERA_ATTR(w_terminal_type, wTerminalType, 16);
+UVCG_DEFAULT_CAMERA_ATTR(b_assoc_terminal, bAssocTerminal, 8);
+UVCG_DEFAULT_CAMERA_ATTR(i_terminal, iTerminal, 8);
 UVCG_DEFAULT_CAMERA_ATTR(w_objective_focal_length_min, wObjectiveFocalLengthMin,
-                        le16_to_cpu);
+                        16);
 UVCG_DEFAULT_CAMERA_ATTR(w_objective_focal_length_max, wObjectiveFocalLengthMax,
-                        le16_to_cpu);
+                        16);
 UVCG_DEFAULT_CAMERA_ATTR(w_ocular_focal_length, wOcularFocalLength,
-                        le16_to_cpu);
-
-#undef identity_conv
+                        16);
 
 #undef UVCG_DEFAULT_CAMERA_ATTR
 
@@ -480,7 +473,7 @@ static const struct uvcg_config_group_type uvcg_camera_grp_type = {
  * control/terminal/output/default
  */
 
-#define UVCG_DEFAULT_OUTPUT_ATTR(cname, aname, conv)                   \
+#define UVCG_DEFAULT_OUTPUT_ATTR(cname, aname, bits)                   \
 static ssize_t uvcg_default_output_##cname##_show(                     \
        struct config_item *item, char *page)                           \
 {                                                                      \
@@ -499,7 +492,7 @@ static ssize_t uvcg_default_output_##cname##_show(                  \
        cd = &opts->uvc_output_terminal;                                \
                                                                        \
        mutex_lock(&opts->lock);                                        \
-       result = sprintf(page, "%d\n", conv(cd->aname));                \
+       result = sprintf(page, "%d\n", le##bits##_to_cpu(cd->aname));   \
        mutex_unlock(&opts->lock);                                      \
                                                                        \
        mutex_unlock(su_mutex);                                         \
@@ -509,15 +502,11 @@ static ssize_t uvcg_default_output_##cname##_show(                        \
                                                                        \
 UVC_ATTR_RO(uvcg_default_output_, cname, aname)
 
-#define identity_conv(x) (x)
-
-UVCG_DEFAULT_OUTPUT_ATTR(b_terminal_id, bTerminalID, identity_conv);
-UVCG_DEFAULT_OUTPUT_ATTR(w_terminal_type, wTerminalType, le16_to_cpu);
-UVCG_DEFAULT_OUTPUT_ATTR(b_assoc_terminal, bAssocTerminal, identity_conv);
-UVCG_DEFAULT_OUTPUT_ATTR(b_source_id, bSourceID, identity_conv);
-UVCG_DEFAULT_OUTPUT_ATTR(i_terminal, iTerminal, identity_conv);
-
-#undef identity_conv
+UVCG_DEFAULT_OUTPUT_ATTR(b_terminal_id, bTerminalID, 8);
+UVCG_DEFAULT_OUTPUT_ATTR(w_terminal_type, wTerminalType, 16);
+UVCG_DEFAULT_OUTPUT_ATTR(b_assoc_terminal, bAssocTerminal, 8);
+UVCG_DEFAULT_OUTPUT_ATTR(b_source_id, bSourceID, 8);
+UVCG_DEFAULT_OUTPUT_ATTR(i_terminal, iTerminal, 8);
 
 #undef UVCG_DEFAULT_OUTPUT_ATTR
 
@@ -990,9 +979,9 @@ static struct configfs_item_operations uvcg_streaming_header_item_ops = {
        .drop_link      = uvcg_streaming_header_drop_link,
 };
 
-#define UVCG_STREAMING_HEADER_ATTR(cname, aname, conv)                 \
+#define UVCG_STREAMING_HEADER_ATTR(cname, aname, bits)                 \
 static ssize_t uvcg_streaming_header_##cname##_show(                   \
-       struct config_item *item, char *page)                   \
+       struct config_item *item, char *page)                           \
 {                                                                      \
        struct uvcg_streaming_header *sh = to_uvcg_streaming_header(item); \
        struct f_uvc_opts *opts;                                        \
@@ -1006,7 +995,7 @@ static ssize_t uvcg_streaming_header_##cname##_show(                       \
        opts = to_f_uvc_opts(opts_item);                                \
                                                                        \
        mutex_lock(&opts->lock);                                        \
-       result = sprintf(page, "%d\n", conv(sh->desc.aname));           \
+       result = sprintf(page, "%d\n", le##bits##_to_cpu(sh->desc.aname));\
        mutex_unlock(&opts->lock);                                      \
                                                                        \
        mutex_unlock(su_mutex);                                         \
@@ -1015,16 +1004,11 @@ static ssize_t uvcg_streaming_header_##cname##_show(                    \
                                                                        \
 UVC_ATTR_RO(uvcg_streaming_header_, cname, aname)
 
-#define identity_conv(x) (x)
-
-UVCG_STREAMING_HEADER_ATTR(bm_info, bmInfo, identity_conv);
-UVCG_STREAMING_HEADER_ATTR(b_terminal_link, bTerminalLink, identity_conv);
-UVCG_STREAMING_HEADER_ATTR(b_still_capture_method, bStillCaptureMethod,
-                          identity_conv);
-UVCG_STREAMING_HEADER_ATTR(b_trigger_support, bTriggerSupport, identity_conv);
-UVCG_STREAMING_HEADER_ATTR(b_trigger_usage, bTriggerUsage, identity_conv);
-
-#undef identity_conv
+UVCG_STREAMING_HEADER_ATTR(bm_info, bmInfo, 8);
+UVCG_STREAMING_HEADER_ATTR(b_terminal_link, bTerminalLink, 8);
+UVCG_STREAMING_HEADER_ATTR(b_still_capture_method, bStillCaptureMethod, 8);
+UVCG_STREAMING_HEADER_ATTR(b_trigger_support, bTriggerSupport, 8);
+UVCG_STREAMING_HEADER_ATTR(b_trigger_usage, bTriggerUsage, 8);
 
 #undef UVCG_STREAMING_HEADER_ATTR
 
@@ -1135,8 +1119,8 @@ static ssize_t  uvcg_frame_##cname##_store(struct config_item *item,      \
        struct config_item *opts_item;                                  \
        struct uvcg_format *fmt;                                        \
        struct mutex *su_mutex = &f->item.ci_group->cg_subsys->su_mutex;\
+       typeof(f->frame.cname) num;                                     \
        int ret;                                                        \
-       u##bits num;                                                    \
                                                                        \
        ret = kstrtou##bits(page, 0, &num);                             \
        if (ret)                                                        \
@@ -1512,7 +1496,7 @@ end:
 
 UVC_ATTR(uvcg_uncompressed_, guid_format, guidFormat);
 
-#define UVCG_UNCOMPRESSED_ATTR_RO(cname, aname, conv)                  \
+#define UVCG_UNCOMPRESSED_ATTR_RO(cname, aname, bits)                  \
 static ssize_t uvcg_uncompressed_##cname##_show(                       \
        struct config_item *item, char *page)                           \
 {                                                                      \
@@ -1528,7 +1512,7 @@ static ssize_t uvcg_uncompressed_##cname##_show(                  \
        opts = to_f_uvc_opts(opts_item);                                \
                                                                        \
        mutex_lock(&opts->lock);                                        \
-       result = sprintf(page, "%d\n", conv(u->desc.aname));            \
+       result = sprintf(page, "%d\n", le##bits##_to_cpu(u->desc.aname));\
        mutex_unlock(&opts->lock);                                      \
                                                                        \
        mutex_unlock(su_mutex);                                         \
@@ -1537,7 +1521,7 @@ static ssize_t uvcg_uncompressed_##cname##_show(                  \
                                                                        \
 UVC_ATTR_RO(uvcg_uncompressed_, cname, aname);
 
-#define UVCG_UNCOMPRESSED_ATTR(cname, aname, conv)                     \
+#define UVCG_UNCOMPRESSED_ATTR(cname, aname, bits)                     \
 static ssize_t uvcg_uncompressed_##cname##_show(                       \
        struct config_item *item, char *page)                           \
 {                                                                      \
@@ -1553,7 +1537,7 @@ static ssize_t uvcg_uncompressed_##cname##_show(                  \
        opts = to_f_uvc_opts(opts_item);                                \
                                                                        \
        mutex_lock(&opts->lock);                                        \
-       result = sprintf(page, "%d\n", conv(u->desc.aname));            \
+       result = sprintf(page, "%d\n", le##bits##_to_cpu(u->desc.aname));\
        mutex_unlock(&opts->lock);                                      \
                                                                        \
        mutex_unlock(su_mutex);                                         \
@@ -1600,17 +1584,12 @@ end:                                                                    \
                                                                        \
 UVC_ATTR(uvcg_uncompressed_, cname, aname);
 
-#define identity_conv(x) (x)
-
-UVCG_UNCOMPRESSED_ATTR_RO(b_format_index, bFormatIndex, identity_conv);
-UVCG_UNCOMPRESSED_ATTR(b_bits_per_pixel, bBitsPerPixel, identity_conv);
-UVCG_UNCOMPRESSED_ATTR(b_default_frame_index, bDefaultFrameIndex,
-                      identity_conv);
-UVCG_UNCOMPRESSED_ATTR_RO(b_aspect_ratio_x, bAspectRatioX, identity_conv);
-UVCG_UNCOMPRESSED_ATTR_RO(b_aspect_ratio_y, bAspectRatioY, identity_conv);
-UVCG_UNCOMPRESSED_ATTR_RO(bm_interface_flags, bmInterfaceFlags, identity_conv);
-
-#undef identity_conv
+UVCG_UNCOMPRESSED_ATTR_RO(b_format_index, bFormatIndex, 8);
+UVCG_UNCOMPRESSED_ATTR(b_bits_per_pixel, bBitsPerPixel, 8);
+UVCG_UNCOMPRESSED_ATTR(b_default_frame_index, bDefaultFrameIndex, 8);
+UVCG_UNCOMPRESSED_ATTR_RO(b_aspect_ratio_x, bAspectRatioX, 8);
+UVCG_UNCOMPRESSED_ATTR_RO(b_aspect_ratio_y, bAspectRatioY, 8);
+UVCG_UNCOMPRESSED_ATTR_RO(bm_interface_flags, bmInterfaceFlags, 8);
 
 #undef UVCG_UNCOMPRESSED_ATTR
 #undef UVCG_UNCOMPRESSED_ATTR_RO
@@ -1716,7 +1695,7 @@ static struct configfs_group_operations uvcg_mjpeg_group_ops = {
        .drop_item              = uvcg_frame_drop,
 };
 
-#define UVCG_MJPEG_ATTR_RO(cname, aname, conv)                         \
+#define UVCG_MJPEG_ATTR_RO(cname, aname, bits)                         \
 static ssize_t uvcg_mjpeg_##cname##_show(struct config_item *item, char *page)\
 {                                                                      \
        struct uvcg_mjpeg *u = to_uvcg_mjpeg(item);                     \
@@ -1731,7 +1710,7 @@ static ssize_t uvcg_mjpeg_##cname##_show(struct config_item *item, char *page)\
        opts = to_f_uvc_opts(opts_item);                                \
                                                                        \
        mutex_lock(&opts->lock);                                        \
-       result = sprintf(page, "%d\n", conv(u->desc.aname));            \
+       result = sprintf(page, "%d\n", le##bits##_to_cpu(u->desc.aname));\
        mutex_unlock(&opts->lock);                                      \
                                                                        \
        mutex_unlock(su_mutex);                                         \
@@ -1740,7 +1719,7 @@ static ssize_t uvcg_mjpeg_##cname##_show(struct config_item *item, char *page)\
                                                                        \
 UVC_ATTR_RO(uvcg_mjpeg_, cname, aname)
 
-#define UVCG_MJPEG_ATTR(cname, aname, conv)                            \
+#define UVCG_MJPEG_ATTR(cname, aname, bits)                            \
 static ssize_t uvcg_mjpeg_##cname##_show(struct config_item *item, char *page)\
 {                                                                      \
        struct uvcg_mjpeg *u = to_uvcg_mjpeg(item);                     \
@@ -1755,7 +1734,7 @@ static ssize_t uvcg_mjpeg_##cname##_show(struct config_item *item, char *page)\
        opts = to_f_uvc_opts(opts_item);                                \
                                                                        \
        mutex_lock(&opts->lock);                                        \
-       result = sprintf(page, "%d\n", conv(u->desc.aname));            \
+       result = sprintf(page, "%d\n", le##bits##_to_cpu(u->desc.aname));\
        mutex_unlock(&opts->lock);                                      \
                                                                        \
        mutex_unlock(su_mutex);                                         \
@@ -1802,17 +1781,12 @@ end:                                                                    \
                                                                        \
 UVC_ATTR(uvcg_mjpeg_, cname, aname)
 
-#define identity_conv(x) (x)
-
-UVCG_MJPEG_ATTR_RO(b_format_index, bFormatIndex, identity_conv);
-UVCG_MJPEG_ATTR(b_default_frame_index, bDefaultFrameIndex,
-                      identity_conv);
-UVCG_MJPEG_ATTR_RO(bm_flags, bmFlags, identity_conv);
-UVCG_MJPEG_ATTR_RO(b_aspect_ratio_x, bAspectRatioX, identity_conv);
-UVCG_MJPEG_ATTR_RO(b_aspect_ratio_y, bAspectRatioY, identity_conv);
-UVCG_MJPEG_ATTR_RO(bm_interface_flags, bmInterfaceFlags, identity_conv);
-
-#undef identity_conv
+UVCG_MJPEG_ATTR_RO(b_format_index, bFormatIndex, 8);
+UVCG_MJPEG_ATTR(b_default_frame_index, bDefaultFrameIndex, 8);
+UVCG_MJPEG_ATTR_RO(bm_flags, bmFlags, 8);
+UVCG_MJPEG_ATTR_RO(b_aspect_ratio_x, bAspectRatioX, 8);
+UVCG_MJPEG_ATTR_RO(b_aspect_ratio_y, bAspectRatioY, 8);
+UVCG_MJPEG_ATTR_RO(bm_interface_flags, bmInterfaceFlags, 8);
 
 #undef UVCG_MJPEG_ATTR
 #undef UVCG_MJPEG_ATTR_RO
@@ -1894,9 +1868,9 @@ static const struct uvcg_config_group_type uvcg_mjpeg_grp_type = {
  * streaming/color_matching/default
  */
 
-#define UVCG_DEFAULT_COLOR_MATCHING_ATTR(cname, aname, conv)           \
+#define UVCG_DEFAULT_COLOR_MATCHING_ATTR(cname, aname, bits)           \
 static ssize_t uvcg_default_color_matching_##cname##_show(             \
-       struct config_item *item, char *page)                   \
+       struct config_item *item, char *page)                           \
 {                                                                      \
        struct config_group *group = to_config_group(item);             \
        struct f_uvc_opts *opts;                                        \
@@ -1912,7 +1886,7 @@ static ssize_t uvcg_default_color_matching_##cname##_show(                \
        cd = &opts->uvc_color_matching;                                 \
                                                                        \
        mutex_lock(&opts->lock);                                        \
-       result = sprintf(page, "%d\n", conv(cd->aname));                \
+       result = sprintf(page, "%d\n", le##bits##_to_cpu(cd->aname));   \
        mutex_unlock(&opts->lock);                                      \
                                                                        \
        mutex_unlock(su_mutex);                                         \
@@ -1921,16 +1895,10 @@ static ssize_t uvcg_default_color_matching_##cname##_show(              \
                                                                        \
 UVC_ATTR_RO(uvcg_default_color_matching_, cname, aname)
 
-#define identity_conv(x) (x)
-
-UVCG_DEFAULT_COLOR_MATCHING_ATTR(b_color_primaries, bColorPrimaries,
-                                identity_conv);
+UVCG_DEFAULT_COLOR_MATCHING_ATTR(b_color_primaries, bColorPrimaries, 8);
 UVCG_DEFAULT_COLOR_MATCHING_ATTR(b_transfer_characteristics,
-                                bTransferCharacteristics, identity_conv);
-UVCG_DEFAULT_COLOR_MATCHING_ATTR(b_matrix_coefficients, bMatrixCoefficients,
-                                identity_conv);
-
-#undef identity_conv
+                                bTransferCharacteristics, 8);
+UVCG_DEFAULT_COLOR_MATCHING_ATTR(b_matrix_coefficients, bMatrixCoefficients, 8);
 
 #undef UVCG_DEFAULT_COLOR_MATCHING_ATTR
 
@@ -2419,7 +2387,7 @@ static struct configfs_item_operations uvc_func_item_ops = {
        .release        = uvc_func_item_release,
 };
 
-#define UVCG_OPTS_ATTR(cname, aname, str2u, uxx, limit)                        \
+#define UVCG_OPTS_ATTR(cname, aname, limit)                            \
 static ssize_t f_uvc_opts_##cname##_show(                              \
        struct config_item *item, char *page)                           \
 {                                                                      \
@@ -2438,8 +2406,8 @@ f_uvc_opts_##cname##_store(struct config_item *item,                      \
                           const char *page, size_t len)                \
 {                                                                      \
        struct f_uvc_opts *opts = to_f_uvc_opts(item);                  \
+       unsigned int num;                                               \
        int ret;                                                        \
-       uxx num;                                                        \
                                                                        \
        mutex_lock(&opts->lock);                                        \
        if (opts->refcnt) {                                             \
@@ -2447,7 +2415,7 @@ f_uvc_opts_##cname##_store(struct config_item *item,                      \
                goto end;                                               \
        }                                                               \
                                                                        \
-       ret = str2u(page, 0, &num);                                     \
+       ret = kstrtouint(page, 0, &num);                                \
        if (ret)                                                        \
                goto end;                                               \
                                                                        \
@@ -2464,13 +2432,9 @@ end:                                                                     \
                                                                        \
 UVC_ATTR(f_uvc_opts_, cname, cname)
 
-#define identity_conv(x) (x)
-
-UVCG_OPTS_ATTR(streaming_interval, streaming_interval, kstrtou8, u8, 16);
-UVCG_OPTS_ATTR(streaming_maxpacket, streaming_maxpacket, kstrtou16, u16, 3072);
-UVCG_OPTS_ATTR(streaming_maxburst, streaming_maxburst, kstrtou8, u8, 15);
-
-#undef identity_conv
+UVCG_OPTS_ATTR(streaming_interval, streaming_interval, 16);
+UVCG_OPTS_ATTR(streaming_maxpacket, streaming_maxpacket, 3072);
+UVCG_OPTS_ATTR(streaming_maxburst, streaming_maxburst, 15);
 
 #undef UVCG_OPTS_ATTR