On Fri, Jul 19 2013, Andrzej Pietrasiewicz wrote:
> fsg_common_init is a lengthy function. Now there are helper functions
> which cover all parts of it. Use them.
>
> Signed-off-by: Andrzej Pietrasiewicz <andrzej.p@xxxxxxxxxxx>
> Signed-off-by: Kyungmin Park <kyungmin.park@xxxxxxxxxxx>
Acked-by: Michal Nazarewicz <mina86@xxxxxxxxxx>
> ---
> drivers/usb/gadget/f_mass_storage.c | 23 ++---------------------
> 1 files changed, 2 insertions(+), 21 deletions(-)
>
> diff --git a/drivers/usb/gadget/f_mass_storage.c b/drivers/usb/gadget/f_mass_storage.c
> index b168a50..9f36e12 100644
> --- a/drivers/usb/gadget/f_mass_storage.c
> +++ b/drivers/usb/gadget/f_mass_storage.c
> @@ -3003,7 +3003,6 @@ struct fsg_common *fsg_common_init(struct fsg_common *common,
> struct usb_gadget *gadget = cdev->gadget;
> struct fsg_lun **curlun_it;
> struct fsg_lun_config *lcfg;
> - struct usb_string *us;
> int nluns, i, rc;
> char *pathbuf;
>
> @@ -3024,19 +3023,9 @@ struct fsg_common *fsg_common_init(struct fsg_common *common,
> fsg_common_set_ops(common, cfg->ops);
> fsg_common_set_private_data(common, cfg->private_data);
>
> - common->gadget = gadget;
> - common->ep0 = gadget->ep0;
> - common->ep0req = cdev->req;
> - common->cdev = cdev;
> -
> - us = usb_gstrings_attach(cdev, fsg_strings_array,
> - ARRAY_SIZE(fsg_strings));
> - if (IS_ERR(us)) {
> - rc = PTR_ERR(us);
> + rc = fsg_common_set_cdev(common, cdev, cfg->can_stall);
> + if (rc)
> goto error_release;
> - }
> - fsg_intf_desc.iInterface = us[FSG_STRING_INTERFACE].id;
> -
>
> rc = fsg_common_set_nluns(common, cfg->nluns);
> if (rc)
> @@ -3118,14 +3107,6 @@ struct fsg_common *fsg_common_init(struct fsg_common *common,
> : "File-Stor Gadget"),
> i);
>
> - /*
> - * Some peripheral controllers are known not to be able to
> - * halt bulk endpoints correctly. If one of them is present,
> - * disable stalls.
> - */
> - common->can_stall = cfg->can_stall &&
> - !(gadget_is_at91(common->gadget));
> -
>
> /* Tell the thread to start working */
> common->thread_task =
> --
> 1.7.0.4
>
--
Best regards, _ _
.o. | Liege of Serenely Enlightened Majesty of o' \,=./ `o
..o | Computer Science, Michał “mina86” Nazarewicz (o o)
ooo +----<email/xmpp: mpn@xxxxxxxxxx>--------------ooO--(_)--Ooo--Attachment:
signature.asc
Description: PGP signature
