fs_parse: fold fs_parameter_desc/fs_parameter_spec

[linux-2.6-microblaze.git] / drivers / usb / gadget / function / f_fs.c

diff --git a/drivers/usb/gadget/function/f_fs.c b/drivers/usb/gadget/function/f_fs.c
index eda1972..997e2c9 100644 (file)
--- a/drivers/usb/gadget/function/f_fs.c
+++ b/drivers/usb/gadget/function/f_fs.c
@@ -1486,7 +1486,7 @@ enum {
        Opt_gid,
 };
 
-static const struct fs_parameter_spec ffs_fs_param_specs[] = {
+static const struct fs_parameter_spec ffs_fs_fs_parameters[] = {
        fsparam_bool    ("no_disconnect",       Opt_no_disconnect),
        fsparam_u32     ("rmode",               Opt_rmode),
        fsparam_u32     ("fmode",               Opt_fmode),
@@ -1496,10 +1496,6 @@ static const struct fs_parameter_spec ffs_fs_param_specs[] = {
        {}
 };
 
-static const struct fs_parameter_description ffs_fs_fs_parameters = {
-       .specs          = ffs_fs_param_specs,
-};
-
 static int ffs_fs_parse_param(struct fs_context *fc, struct fs_parameter *param)
 {
        struct ffs_sb_fill_data *data = fc->fs_private;
@@ -1508,7 +1504,7 @@ static int ffs_fs_parse_param(struct fs_context *fc, struct fs_parameter *param)
 
        ENTER();
 
-       opt = fs_parse(fc, &ffs_fs_fs_parameters, param, &result);
+       opt = fs_parse(fc, ffs_fs_fs_parameters, param, &result);
        if (opt < 0)
                return opt;
 
@@ -1640,7 +1636,7 @@ static struct file_system_type ffs_fs_type = {
        .owner          = THIS_MODULE,
        .name           = "functionfs",
        .init_fs_context = ffs_fs_init_fs_context,
-       .parameters     = &ffs_fs_fs_parameters,
+       .parameters     = ffs_fs_fs_parameters,
        .kill_sb        = ffs_fs_kill_sb,
 };
 MODULE_ALIAS_FS("functionfs");