aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/gadget/mass_storage.c
diff options
context:
space:
mode:
authorMichal Nazarewicz <m.nazarewicz@samsung.com>2009-11-09 14:15:21 +0100
committerGreg Kroah-Hartman <gregkh@suse.de>2009-12-11 11:55:22 -0800
commit481e49296ae6979891af30c9858511d4347a5393 (patch)
tree9c78e22db74134e4ccd96df62d92295b7c88da31 /drivers/usb/gadget/mass_storage.c
parentd23b0f08d18fc42f26f6a0776c6d827eb35143a9 (diff)
downloadkernel_samsung_smdk4412-481e49296ae6979891af30c9858511d4347a5393.zip
kernel_samsung_smdk4412-481e49296ae6979891af30c9858511d4347a5393.tar.gz
kernel_samsung_smdk4412-481e49296ae6979891af30c9858511d4347a5393.tar.bz2
USB: g_mass_storage: fsg_config added & module params handlig changed
Removed all references to mod_data in f_mass_storage.c and instead created fsg_config structure fsg_common_init() takes as an argument -- it stores all configuration options that were previously taken from mod_data. Moreover, The fsg_config structure allows per-LUN configuration of removable and CD-ROM emulation. Module parameters are handled by defining an object of fsg_module_parameters structure and then declaring module parameters via FSG_MODULE_PARAMETERS() macro. It adds proper declarations to the code making specified object be populated from module parameters. To use values stored there one may use either fsg_config_from_params() which will will a fsg_config structure with values taken from fsg_module_parameters structure or fsg_common_from_params() which will initialise fsg_common structure directly. Signed-off-by: Michal Nazarewicz <m.nazarewicz@samsung.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/gadget/mass_storage.c')
-rw-r--r--drivers/usb/gadget/mass_storage.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/usb/gadget/mass_storage.c b/drivers/usb/gadget/mass_storage.c
index 27339f0..00396a3 100644
--- a/drivers/usb/gadget/mass_storage.c
+++ b/drivers/usb/gadget/mass_storage.c
@@ -127,6 +127,11 @@ static struct usb_gadget_strings *dev_strings[] = {
/****************************** Configurations ******************************/
+static struct fsg_module_parameters mod_data = {
+ .stall = 1
+};
+FSG_MODULE_PARAMETERS(/* no prefix */, mod_data);
+
static int __init msg_do_config(struct usb_configuration *c)
{
struct fsg_common *common;
@@ -137,7 +142,7 @@ static int __init msg_do_config(struct usb_configuration *c)
c->bmAttributes |= USB_CONFIG_ATT_WAKEUP;
}
- common = fsg_common_init(0, c->cdev);
+ common = fsg_common_from_params(0, c->cdev, &mod_data);
if (IS_ERR(common))
return PTR_ERR(common);