1 files changed, 36 insertions, 47 deletions

diff --git a/drivers/usb/gadget/function/f_sourcesink.c b/drivers/usb/gadget/function/f_sourcesink.c
index d7646d3acd63..9f3ced62d916 100644
--- a/drivers/usb/gadget/function/f_sourcesink.c
+++ b/drivers/usb/gadget/function/f_sourcesink.c
@@ -889,9 +889,6 @@ static inline struct f_ss_opts *to_f_ss_opts(struct config_item *item)
                             func_inst.group);
 }
 
-CONFIGFS_ATTR_STRUCT(f_ss_opts);
-CONFIGFS_ATTR_OPS(f_ss_opts);
-
 static void ss_attr_release(struct config_item *item)
 {
         struct f_ss_opts *ss_opts = to_f_ss_opts(item);
@@ -901,12 +898,11 @@ static void ss_attr_release(struct config_item *item)
 
 static struct configfs_item_operations ss_item_ops = {
         .release                = ss_attr_release,
-        .show_attribute         = f_ss_opts_attr_show,
-        .store_attribute        = f_ss_opts_attr_store,
 };
 
-static ssize_t f_ss_opts_pattern_show(struct f_ss_opts *opts, char *page)
+static ssize_t f_ss_opts_pattern_show(struct config_item *item, char *page)
 {
+        struct f_ss_opts *opts = to_f_ss_opts(item);
         int result;
 
         mutex_lock(&opts->lock);
@@ -916,9 +912,10 @@ static ssize_t f_ss_opts_pattern_show(struct f_ss_opts *opts, char *page)
         return result;
 }
 
-static ssize_t f_ss_opts_pattern_store(struct f_ss_opts *opts,
+static ssize_t f_ss_opts_pattern_store(struct config_item *item,
                                        const char *page, size_t len)
 {
+        struct f_ss_opts *opts = to_f_ss_opts(item);
         int ret;
         u8 num;
 
@@ -944,13 +941,11 @@ end:
         return ret;
 }
 
-static struct f_ss_opts_attribute f_ss_opts_pattern =
-        __CONFIGFS_ATTR(pattern, S_IRUGO | S_IWUSR,
-                        f_ss_opts_pattern_show,
-                        f_ss_opts_pattern_store);
+CONFIGFS_ATTR(f_ss_opts_, pattern);
 
-static ssize_t f_ss_opts_isoc_interval_show(struct f_ss_opts *opts, char *page)
+static ssize_t f_ss_opts_isoc_interval_show(struct config_item *item, char *page)
 {
+        struct f_ss_opts *opts = to_f_ss_opts(item);
         int result;
 
         mutex_lock(&opts->lock);
@@ -960,9 +955,10 @@ static ssize_t f_ss_opts_isoc_interval_show(struct f_ss_opts *opts, char *page)
         return result;
 }
 
-static ssize_t f_ss_opts_isoc_interval_store(struct f_ss_opts *opts,
+static ssize_t f_ss_opts_isoc_interval_store(struct config_item *item,
                                        const char *page, size_t len)
 {
+        struct f_ss_opts *opts = to_f_ss_opts(item);
         int ret;
         u8 num;
 
@@ -988,13 +984,11 @@ end:
         return ret;
 }
 
-static struct f_ss_opts_attribute f_ss_opts_isoc_interval =
-        __CONFIGFS_ATTR(isoc_interval, S_IRUGO | S_IWUSR,
-                        f_ss_opts_isoc_interval_show,
-                        f_ss_opts_isoc_interval_store);
+CONFIGFS_ATTR(f_ss_opts_, isoc_interval);
 
-static ssize_t f_ss_opts_isoc_maxpacket_show(struct f_ss_opts *opts, char *page)
+static ssize_t f_ss_opts_isoc_maxpacket_show(struct config_item *item, char *page)
 {
+        struct f_ss_opts *opts = to_f_ss_opts(item);
         int result;
 
         mutex_lock(&opts->lock);
@@ -1004,9 +998,10 @@ static ssize_t f_ss_opts_isoc_maxpacket_show(struct f_ss_opts *opts, char *page)
         return result;
 }
 
-static ssize_t f_ss_opts_isoc_maxpacket_store(struct f_ss_opts *opts,
+static ssize_t f_ss_opts_isoc_maxpacket_store(struct config_item *item,
                                        const char *page, size_t len)
 {
+        struct f_ss_opts *opts = to_f_ss_opts(item);
         int ret;
         u16 num;
 
@@ -1032,13 +1027,11 @@ end:
         return ret;
 }
 
-static struct f_ss_opts_attribute f_ss_opts_isoc_maxpacket =
-        __CONFIGFS_ATTR(isoc_maxpacket, S_IRUGO | S_IWUSR,
-                        f_ss_opts_isoc_maxpacket_show,
-                        f_ss_opts_isoc_maxpacket_store);
+CONFIGFS_ATTR(f_ss_opts_, isoc_maxpacket);
 
-static ssize_t f_ss_opts_isoc_mult_show(struct f_ss_opts *opts, char *page)
+static ssize_t f_ss_opts_isoc_mult_show(struct config_item *item, char *page)
 {
+        struct f_ss_opts *opts = to_f_ss_opts(item);
         int result;
 
         mutex_lock(&opts->lock);
@@ -1048,9 +1041,10 @@ static ssize_t f_ss_opts_isoc_mult_show(struct f_ss_opts *opts, char *page)
         return result;
 }
 
-static ssize_t f_ss_opts_isoc_mult_store(struct f_ss_opts *opts,
+static ssize_t f_ss_opts_isoc_mult_store(struct config_item *item,
                                        const char *page, size_t len)
 {
+        struct f_ss_opts *opts = to_f_ss_opts(item);
         int ret;
         u8 num;
 
@@ -1076,13 +1070,11 @@ end:
         return ret;
 }
 
-static struct f_ss_opts_attribute f_ss_opts_isoc_mult =
-        __CONFIGFS_ATTR(isoc_mult, S_IRUGO | S_IWUSR,
-                        f_ss_opts_isoc_mult_show,
-                        f_ss_opts_isoc_mult_store);
+CONFIGFS_ATTR(f_ss_opts_, isoc_mult);
 
-static ssize_t f_ss_opts_isoc_maxburst_show(struct f_ss_opts *opts, char *page)
+static ssize_t f_ss_opts_isoc_maxburst_show(struct config_item *item, char *page)
 {
+        struct f_ss_opts *opts = to_f_ss_opts(item);
         int result;
 
         mutex_lock(&opts->lock);
@@ -1092,9 +1084,10 @@ static ssize_t f_ss_opts_isoc_maxburst_show(struct f_ss_opts *opts, char *page)
         return result;
 }
 
-static ssize_t f_ss_opts_isoc_maxburst_store(struct f_ss_opts *opts,
+static ssize_t f_ss_opts_isoc_maxburst_store(struct config_item *item,
                                        const char *page, size_t len)
 {
+        struct f_ss_opts *opts = to_f_ss_opts(item);
         int ret;
         u8 num;
 
@@ -1120,13 +1113,11 @@ end:
         return ret;
 }
 
-static struct f_ss_opts_attribute f_ss_opts_isoc_maxburst =
-        __CONFIGFS_ATTR(isoc_maxburst, S_IRUGO | S_IWUSR,
-                        f_ss_opts_isoc_maxburst_show,
-                        f_ss_opts_isoc_maxburst_store);
+CONFIGFS_ATTR(f_ss_opts_, isoc_maxburst);
 
-static ssize_t f_ss_opts_bulk_buflen_show(struct f_ss_opts *opts, char *page)
+static ssize_t f_ss_opts_bulk_buflen_show(struct config_item *item, char *page)
 {
+        struct f_ss_opts *opts = to_f_ss_opts(item);
         int result;
 
         mutex_lock(&opts->lock);
@@ -1136,9 +1127,10 @@ static ssize_t f_ss_opts_bulk_buflen_show(struct f_ss_opts *opts, char *page)
         return result;
 }
 
-static ssize_t f_ss_opts_bulk_buflen_store(struct f_ss_opts *opts,
+static ssize_t f_ss_opts_bulk_buflen_store(struct config_item *item,
                                            const char *page, size_t len)
 {
+        struct f_ss_opts *opts = to_f_ss_opts(item);
         int ret;
         u32 num;
 
@@ -1159,18 +1151,15 @@ end:
         return ret;
 }
 
-static struct f_ss_opts_attribute f_ss_opts_bulk_buflen =
-        __CONFIGFS_ATTR(buflen, S_IRUGO | S_IWUSR,
-                        f_ss_opts_bulk_buflen_show,
-                        f_ss_opts_bulk_buflen_store);
+CONFIGFS_ATTR(f_ss_opts_, bulk_buflen);
 
 static struct configfs_attribute *ss_attrs[] = {
-        &f_ss_opts_pattern.attr,
-        &f_ss_opts_isoc_interval.attr,
-        &f_ss_opts_isoc_maxpacket.attr,
-        &f_ss_opts_isoc_mult.attr,
-        &f_ss_opts_isoc_maxburst.attr,
-        &f_ss_opts_bulk_buflen.attr,
+        &f_ss_opts_attr_pattern,
+        &f_ss_opts_attr_isoc_interval,
+        &f_ss_opts_attr_isoc_maxpacket,
+        &f_ss_opts_attr_isoc_mult,
+        &f_ss_opts_attr_isoc_maxburst,
+        &f_ss_opts_attr_bulk_buflen,
         NULL,
 };