1 files changed, 4 insertions, 22 deletions

diff --git a/drivers/usb/gadget/function/f_serial.c b/drivers/usb/gadget/function/f_serial.c
index ba705e047d7e..6bb44d613bab 100644
--- a/drivers/usb/gadget/function/f_serial.c
+++ b/drivers/usb/gadget/function/f_serial.c
@@ -258,22 +258,6 @@ static inline struct f_serial_opts *to_f_serial_opts(struct config_item *item)
                             func_inst.group);
 }
 
-CONFIGFS_ATTR_STRUCT(f_serial_opts);
-static ssize_t f_serial_attr_show(struct config_item *item,
-                                  struct configfs_attribute *attr,
-                                  char *page)
-{
-        struct f_serial_opts *opts = to_f_serial_opts(item);
-        struct f_serial_opts_attribute *f_serial_opts_attr =
-                container_of(attr, struct f_serial_opts_attribute, attr);
-        ssize_t ret = 0;
-
-        if (f_serial_opts_attr->show)
-                ret = f_serial_opts_attr->show(opts, page);
-
-        return ret;
-}
-
 static void serial_attr_release(struct config_item *item)
 {
         struct f_serial_opts *opts = to_f_serial_opts(item);
@@ -283,19 +267,17 @@ static void serial_attr_release(struct config_item *item)
 
 static struct configfs_item_operations serial_item_ops = {
         .release        = serial_attr_release,
-        .show_attribute = f_serial_attr_show,
 };
 
-static ssize_t f_serial_port_num_show(struct f_serial_opts *opts, char *page)
+static ssize_t f_serial_port_num_show(struct config_item *item, char *page)
 {
-        return sprintf(page, "%u\n", opts->port_num);
+        return sprintf(page, "%u\n", to_f_serial_opts(item)->port_num);
 }
 
-static struct f_serial_opts_attribute f_serial_port_num =
-        __CONFIGFS_ATTR_RO(port_num, f_serial_port_num_show);
+CONFIGFS_ATTR_RO(f_serial_, port_num);
 
 static struct configfs_attribute *acm_attrs[] = {
-        &f_serial_port_num.attr,
+        &f_serial_attr_port_num,
         NULL,
 };