diff options
Diffstat (limited to 'patches.tizen/1131-usb-gadget-f_mass_storage-create-lun-handling-helper.patch')
| -rw-r--r-- | patches.tizen/1131-usb-gadget-f_mass_storage-create-lun-handling-helper.patch | 153 |
1 files changed, 153 insertions, 0 deletions
diff --git a/patches.tizen/1131-usb-gadget-f_mass_storage-create-lun-handling-helper.patch b/patches.tizen/1131-usb-gadget-f_mass_storage-create-lun-handling-helper.patch new file mode 100644 index 00000000000..eeea3e8d6ec --- /dev/null +++ b/patches.tizen/1131-usb-gadget-f_mass_storage-create-lun-handling-helper.patch @@ -0,0 +1,153 @@ +From 9c9c989baca50c583b20785371bc466f89b924bd Mon Sep 17 00:00:00 2001 +From: Andrzej Pietrasiewicz <andrzej.p@samsung.com> +Date: Wed, 9 Oct 2013 10:05:56 +0200 +Subject: [PATCH 1131/1302] usb: gadget: f_mass_storage: create lun handling + helpers for use in fsg_common_init + +fsg_common_init is a lengthy function. Factor portions of it out. + +Signed-off-by: Andrzej Pietrasiewicz <andrzej.p@samsung.com> +Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> +Acked-by: Michal Nazarewicz <mina86@mina86.com> +Signed-off-by: Felipe Balbi <balbi@ti.com> +Signed-off-by: MyungJoo Ham <myungjoo.ham@samsung.com> +--- + drivers/usb/gadget/f_mass_storage.c | 80 +++++++++++++++++++++++++++++-------- + drivers/usb/gadget/f_mass_storage.h | 8 ++++ + 2 files changed, 71 insertions(+), 17 deletions(-) + +diff --git a/drivers/usb/gadget/f_mass_storage.c b/drivers/usb/gadget/f_mass_storage.c +index 79d98997..cb789fa 100644 +--- a/drivers/usb/gadget/f_mass_storage.c ++++ b/drivers/usb/gadget/f_mass_storage.c +@@ -2752,6 +2752,64 @@ static inline void fsg_common_remove_sysfs(struct fsg_lun *lun) + device_remove_file(&lun->dev, &dev_attr_file); + } + ++void fsg_common_remove_lun(struct fsg_lun *lun, bool sysfs) ++{ ++ if (sysfs) { ++ fsg_common_remove_sysfs(lun); ++ device_unregister(&lun->dev); ++ } ++ fsg_lun_close(lun); ++ kfree(lun); ++} ++ ++static void _fsg_common_remove_luns(struct fsg_common *common, int n) ++{ ++ int i; ++ ++ for (i = 0; i < n; ++i) ++ if (common->luns[i]) { ++ fsg_common_remove_lun(common->luns[i], common->sysfs); ++ common->luns[i] = NULL; ++ } ++} ++ ++void fsg_common_remove_luns(struct fsg_common *common) ++{ ++ _fsg_common_remove_luns(common, common->nluns); ++} ++ ++void fsg_common_free_luns(struct fsg_common *common) ++{ ++ fsg_common_remove_luns(common); ++ kfree(common->luns); ++ common->luns = NULL; ++} ++ ++int fsg_common_set_nluns(struct fsg_common *common, int nluns) ++{ ++ struct fsg_lun **curlun; ++ ++ /* Find out how many LUNs there should be */ ++ if (nluns < 1 || nluns > FSG_MAX_LUNS) { ++ pr_err("invalid number of LUNs: %u\n", nluns); ++ return -EINVAL; ++ } ++ ++ curlun = kcalloc(nluns, sizeof(*curlun), GFP_KERNEL); ++ if (unlikely(!curlun)) ++ return -ENOMEM; ++ ++ if (common->luns) ++ fsg_common_free_luns(common); ++ ++ common->luns = curlun; ++ common->nluns = nluns; ++ ++ pr_info("Number of LUNs=%d\n", common->nluns); ++ ++ return 0; ++} ++ + struct fsg_common *fsg_common_init(struct fsg_common *common, + struct usb_composite_dev *cdev, + struct fsg_config *cfg) +@@ -2763,12 +2821,6 @@ struct fsg_common *fsg_common_init(struct fsg_common *common, + int nluns, i, rc; + char *pathbuf; + +- /* Find out how many LUNs there should be */ +- nluns = cfg->nluns; +- if (nluns < 1 || nluns > FSG_MAX_LUNS) { +- dev_err(&gadget->dev, "invalid number of LUNs: %u\n", nluns); +- return ERR_PTR(-EINVAL); +- } + + common = fsg_common_setup(common); + if (IS_ERR(common)) +@@ -2798,17 +2850,12 @@ struct fsg_common *fsg_common_init(struct fsg_common *common, + } + fsg_intf_desc.iInterface = us[FSG_STRING_INTERFACE].id; + +- /* +- * Create the LUNs, open their backing files, and register the +- * LUN devices in sysfs. +- */ +- curlun_it = kcalloc(nluns, sizeof(*curlun_it), GFP_KERNEL); +- if (unlikely(!curlun_it)) { +- rc = -ENOMEM; +- goto error_release; +- } +- common->luns = curlun_it; + ++ rc = fsg_common_set_nluns(common, cfg->nluns); ++ if (rc) ++ goto error_release; ++ curlun_it = common->luns; ++ nluns = cfg->nluns; + for (i = 0, lcfg = cfg->luns; i < nluns; ++i, ++curlun_it, ++lcfg) { + struct fsg_lun *curlun; + +@@ -2866,7 +2913,6 @@ struct fsg_common *fsg_common_init(struct fsg_common *common, + goto error_luns; + } + } +- common->nluns = nluns; + + + /* Prepare inquiryString */ +diff --git a/drivers/usb/gadget/f_mass_storage.h b/drivers/usb/gadget/f_mass_storage.h +index a00f51a..f98c792 100644 +--- a/drivers/usb/gadget/f_mass_storage.h ++++ b/drivers/usb/gadget/f_mass_storage.h +@@ -106,6 +106,14 @@ void fsg_common_set_sysfs(struct fsg_common *common, bool sysfs); + + int fsg_common_set_num_buffers(struct fsg_common *common, unsigned int n); + ++void fsg_common_remove_lun(struct fsg_lun *lun, bool sysfs); ++ ++void fsg_common_remove_luns(struct fsg_common *common); ++ ++void fsg_common_free_luns(struct fsg_common *common); ++ ++int fsg_common_set_nluns(struct fsg_common *common, int nluns); ++ + void fsg_config_from_params(struct fsg_config *cfg, + const struct fsg_module_parameters *params, + unsigned int fsg_num_buffers); +-- +1.8.3.2 + |