Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1337128

Re: [PATCH v2 RESEND] usb: gadget: provide interface for legacy gadgets to get UDC name

Show all headers | View raw

[Multipart message — attachments visible in raw view] - view raw

Hi,

Marek Szyprowski <m.szyprowski@samsung.com> writes:
> Since commit 855ed04a3758b205e84b269f92d26ab36ed8e2f7 ("usb: gadget:
> udc-core: independent registration of gadgets and gadget drivers") gadget
> drivers can not assume that UDC drivers are already available on their
> initialization. This broke the HACK, which was used in gadgetfs driver,
> to get UDC controller name. This patch removes this hack and replaces it
> by additional function in the UDC core (which is usefully only for legacy
> drivers, please don't use it in the new code).
>
> Reported-by: Vegard Nossum <vegard.nossum@oracle.com>
> Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
> Tested-by: Vegard Nossum <vegard.nossum@oracle.com>
> ---
> changelog:
> v2:
> - properly report udc gagdet driver name instead of udc device name
>
> v1: https://lkml.org/lkml/2016/2/8/176
> - initial version
> ---
>  drivers/usb/gadget/legacy/inode.c | 29 ++---------------------------
>  drivers/usb/gadget/udc/udc-core.c | 33 +++++++++++++++++++++++++++++++++
>  include/linux/usb/gadget.h        |  1 +
>  3 files changed, 36 insertions(+), 27 deletions(-)
>
> diff --git a/drivers/usb/gadget/legacy/inode.c b/drivers/usb/gadget/legacy/inode.c
> index 7e179f81d05c..7a62a2f7bc18 100644
> --- a/drivers/usb/gadget/legacy/inode.c
> +++ b/drivers/usb/gadget/legacy/inode.c
> @@ -227,7 +227,7 @@ static void put_ep (struct ep_data *data)
>   * implicitly, starting with the driver name and then endpoint names.
>   */
>  
> -static const char *CHIP;
> +static char CHIP[32];
>  
>  /*----------------------------------------------------------------------*/
>  
> @@ -1697,28 +1697,6 @@ static struct usb_gadget_driver gadgetfs_driver = {
>  };
>  
>  /*----------------------------------------------------------------------*/
> -
> -static void gadgetfs_nop(struct usb_gadget *arg) { }
> -
> -static int gadgetfs_probe(struct usb_gadget *gadget,
> -		struct usb_gadget_driver *driver)
> -{
> -	CHIP = gadget->name;
> -	return -EISNAM;
> -}
> -
> -static struct usb_gadget_driver probe_driver = {
> -	.max_speed	= USB_SPEED_HIGH,
> -	.bind		= gadgetfs_probe,
> -	.unbind		= gadgetfs_nop,
> -	.setup		= (void *)gadgetfs_nop,
> -	.disconnect	= gadgetfs_nop,
> -	.driver	= {
> -		.name		= "nop",
> -	},
> -};
> -
> -
>  /* DEVICE INITIALIZATION
>   *
>   *     fd = open ("/dev/gadget/$CHIP", O_RDWR)
> @@ -1968,10 +1946,7 @@ gadgetfs_fill_super (struct super_block *sb, void *opts, int silent)
>  	if (the_device)
>  		return -ESRCH;
>  
> -	/* fake probe to determine $CHIP */
> -	CHIP = NULL;
> -	usb_gadget_probe_driver(&probe_driver);
> -	if (!CHIP)
> +	if (usb_get_gadget_udc_name(CHIP, sizeof(CHIP)) != 0)
>  		return -ENODEV;
>  
>  	/* superblock */
> diff --git a/drivers/usb/gadget/udc/udc-core.c b/drivers/usb/gadget/udc/udc-core.c
> index fd73a3ea07c2..4bde2e110e44 100644
> --- a/drivers/usb/gadget/udc/udc-core.c
> +++ b/drivers/usb/gadget/udc/udc-core.c
> @@ -442,6 +442,39 @@ err1:
>  EXPORT_SYMBOL_GPL(usb_add_gadget_udc_release);
>  
>  /**
> + * usb_get_gadget_udc_name - get the name of the first UDC controller
> + * @dst_name
> + * @len

gotta describe these and add a blank line after @len too.

This also seems a little too big for -rc.

-- 
balbi

Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread

Thread

[PATCH v2 RESEND] usb: gadget: provide interface for legacy gadgets to  get UDC name Marek Szyprowski <m.szyprowski@samsung.com> - 2016-02-18 09:00 +0100
  Re: [PATCH v2 RESEND] usb: gadget: provide interface for legacy gadgets to get UDC name Felipe Balbi <balbif@gmail.com> - 2016-02-18 09:20 +0100

csiph-web