summaryrefslogtreecommitdiffstats
path: root/drivers/usb
diff options
context:
space:
mode:
authorAndrzej Pietrasiewicz <andrzej.p@samsung.com>2013-10-16 08:34:51 +0200
committerFelipe Balbi <balbi@ti.com>2013-10-17 11:29:07 -0500
commit5bb7289d7f9d5c7418892c342824196602d20729 (patch)
treeeeddf2c85e64b0e2c1f8cf0eb8f28268604ac308 /drivers/usb
parent24616eb66a996d30bf6449feb313a29cd1083cf9 (diff)
downloadop-kernel-dev-5bb7289d7f9d5c7418892c342824196602d20729.zip
op-kernel-dev-5bb7289d7f9d5c7418892c342824196602d20729.tar.gz
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: Michal Nazarewicz <mina86@mina86.com> Signed-off-by: Andrzej Pietrasiewicz <andrzej.p@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> Signed-off-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'drivers/usb')
-rw-r--r--drivers/usb/gadget/f_mass_storage.c37
1 files changed, 18 insertions, 19 deletions
diff --git a/drivers/usb/gadget/f_mass_storage.c b/drivers/usb/gadget/f_mass_storage.c
index 6b5f451..8fa8b1f7 100644
--- a/drivers/usb/gadget/f_mass_storage.c
+++ b/drivers/usb/gadget/f_mass_storage.c
@@ -3209,9 +3209,9 @@ static void fsg_lun_attr_release(struct config_item *item)
}
static struct configfs_item_operations fsg_lun_item_ops = {
- .release = fsg_lun_attr_release,
- .show_attribute = fsg_lun_opts_attr_show,
- .store_attribute = fsg_lun_opts_attr_store,
+ .release = fsg_lun_attr_release,
+ .show_attribute = fsg_lun_opts_attr_show,
+ .store_attribute = fsg_lun_opts_attr_store,
};
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 = {
.ct_owner = THIS_MODULE,
};
-#define MAX_NAME_LEN 40
-
static struct config_group *fsg_lun_make(struct config_group *group,
const char *name)
{
@@ -3348,7 +3346,8 @@ static struct config_group *fsg_lun_make(struct config_group *group,
fsg_opts = to_fsg_opts(&group->cg_item);
if (num >= FSG_MAX_LUNS)
- return ERR_PTR(-ENODEV);
+ return ERR_PTR(-ERANGE);
+
mutex_lock(&fsg_opts->lock);
if (fsg_opts->refcnt || fsg_opts->common->luns[num]) {
ret = -EBUSY;
@@ -3364,7 +3363,6 @@ static struct config_group *fsg_lun_make(struct config_group *group,
memset(&config, 0, sizeof(config));
config.removable = true;
-
ret = fsg_common_create_lun(fsg_opts->common, &config, num, name,
(const char **)&group->cg_item.ci_name);
if (ret) {
@@ -3418,9 +3416,9 @@ static void fsg_attr_release(struct config_item *item)
}
static struct configfs_item_operations fsg_item_ops = {
- .release = fsg_attr_release,
- .show_attribute = fsg_opts_attr_show,
- .store_attribute = fsg_opts_attr_store,
+ .release = fsg_attr_release,
+ .show_attribute = fsg_opts_attr_show,
+ .store_attribute = fsg_opts_attr_store,
};
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,
size_t len)
{
int ret;
- u8 num;
+ bool stall;
mutex_lock(&opts->lock);
+
if (opts->refcnt) {
- ret = -EBUSY;
- goto end;
+ mutex_unlock(&opts->lock);
+ return -EBUSY;
}
- ret = kstrtou8(page, 0, &num);
- if (ret)
- goto end;
- opts->common->can_stall = num != 0;
- ret = len;
+ ret = strtobool(page, &stall);
+ if (!ret) {
+ opts->common->can_stall = stall;
+ ret = len;
+ }
-end:
mutex_unlock(&opts->lock);
+
return ret;
}
OpenPOWER on IntegriCloud