Commit 5bb7289d authored by Andrzej Pietrasiewicz's avatar Andrzej Pietrasiewicz Committed by Felipe Balbi

usb: gadget: f_mass_storage: style corrections, cleanup & simplification

Fix spacing, improve error code returned, remove unused #define,
use strtobool() instead of kstrtou8().
Acked-by: default avatarMichal Nazarewicz <mina86@mina86.com>
Signed-off-by: default avatarAndrzej Pietrasiewicz <andrzej.p@samsung.com>
Signed-off-by: default avatarKyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
parent 24616eb6
...@@ -3209,9 +3209,9 @@ static void fsg_lun_attr_release(struct config_item *item) ...@@ -3209,9 +3209,9 @@ static void fsg_lun_attr_release(struct config_item *item)
} }
static struct configfs_item_operations fsg_lun_item_ops = { static struct configfs_item_operations fsg_lun_item_ops = {
.release = fsg_lun_attr_release, .release = fsg_lun_attr_release,
.show_attribute = fsg_lun_opts_attr_show, .show_attribute = fsg_lun_opts_attr_show,
.store_attribute = fsg_lun_opts_attr_store, .store_attribute = fsg_lun_opts_attr_store,
}; };
static ssize_t fsg_lun_opts_file_show(struct fsg_lun_opts *opts, char *page) static ssize_t fsg_lun_opts_file_show(struct fsg_lun_opts *opts, char *page)
...@@ -3323,8 +3323,6 @@ static struct config_item_type fsg_lun_type = { ...@@ -3323,8 +3323,6 @@ static struct config_item_type fsg_lun_type = {
.ct_owner = THIS_MODULE, .ct_owner = THIS_MODULE,
}; };
#define MAX_NAME_LEN 40
static struct config_group *fsg_lun_make(struct config_group *group, static struct config_group *fsg_lun_make(struct config_group *group,
const char *name) const char *name)
{ {
...@@ -3348,7 +3346,8 @@ static struct config_group *fsg_lun_make(struct config_group *group, ...@@ -3348,7 +3346,8 @@ static struct config_group *fsg_lun_make(struct config_group *group,
fsg_opts = to_fsg_opts(&group->cg_item); fsg_opts = to_fsg_opts(&group->cg_item);
if (num >= FSG_MAX_LUNS) if (num >= FSG_MAX_LUNS)
return ERR_PTR(-ENODEV); return ERR_PTR(-ERANGE);
mutex_lock(&fsg_opts->lock); mutex_lock(&fsg_opts->lock);
if (fsg_opts->refcnt || fsg_opts->common->luns[num]) { if (fsg_opts->refcnt || fsg_opts->common->luns[num]) {
ret = -EBUSY; ret = -EBUSY;
...@@ -3364,7 +3363,6 @@ static struct config_group *fsg_lun_make(struct config_group *group, ...@@ -3364,7 +3363,6 @@ static struct config_group *fsg_lun_make(struct config_group *group,
memset(&config, 0, sizeof(config)); memset(&config, 0, sizeof(config));
config.removable = true; config.removable = true;
ret = fsg_common_create_lun(fsg_opts->common, &config, num, name, ret = fsg_common_create_lun(fsg_opts->common, &config, num, name,
(const char **)&group->cg_item.ci_name); (const char **)&group->cg_item.ci_name);
if (ret) { if (ret) {
...@@ -3418,9 +3416,9 @@ static void fsg_attr_release(struct config_item *item) ...@@ -3418,9 +3416,9 @@ static void fsg_attr_release(struct config_item *item)
} }
static struct configfs_item_operations fsg_item_ops = { static struct configfs_item_operations fsg_item_ops = {
.release = fsg_attr_release, .release = fsg_attr_release,
.show_attribute = fsg_opts_attr_show, .show_attribute = fsg_opts_attr_show,
.store_attribute = fsg_opts_attr_store, .store_attribute = fsg_opts_attr_store,
}; };
static ssize_t fsg_opts_stall_show(struct fsg_opts *opts, char *page) static ssize_t fsg_opts_stall_show(struct fsg_opts *opts, char *page)
...@@ -3438,22 +3436,23 @@ static ssize_t fsg_opts_stall_store(struct fsg_opts *opts, const char *page, ...@@ -3438,22 +3436,23 @@ static ssize_t fsg_opts_stall_store(struct fsg_opts *opts, const char *page,
size_t len) size_t len)
{ {
int ret; int ret;
u8 num; bool stall;
mutex_lock(&opts->lock); mutex_lock(&opts->lock);
if (opts->refcnt) { if (opts->refcnt) {
ret = -EBUSY; mutex_unlock(&opts->lock);
goto end; return -EBUSY;
} }
ret = kstrtou8(page, 0, &num);
if (ret)
goto end;
opts->common->can_stall = num != 0; ret = strtobool(page, &stall);
ret = len; if (!ret) {
opts->common->can_stall = stall;
ret = len;
}
end:
mutex_unlock(&opts->lock); mutex_unlock(&opts->lock);
return ret; return ret;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment