Subject: [PATCH 12/12] usb: gadget: at91_udc: Allocate udc instance

From: [email-masked] (Felipe Balbi)
Date: Wed, 14 Jan 2015 11:39:06 -0600

On Wed, Jan 14, 2015 at 05:22:04PM +0100, Alexandre Belloni wrote:
> From: Boris Brezillon <[email-masked]>
> 
> Allocate udc structure instead of relying on the statically declared
> object.
> 
> Signed-off-by: Boris Brezillon <[email-masked]>

Acked-by: Felipe Balbi <[email-masked]>

> ---
>  drivers/usb/gadget/udc/at91_udc.c | 96 +++++++++++----------------------------
>  1 file changed, 26 insertions(+), 70 deletions(-)
> 
> diff --git a/drivers/usb/gadget/udc/at91_udc.c b/drivers/usb/gadget/udc/at91_udc.c
> index c0abb9bc76a9..6d285226ab94 100644
> --- a/drivers/usb/gadget/udc/at91_udc.c
> +++ b/drivers/usb/gadget/udc/at91_udc.c
> @@ -59,7 +59,15 @@
>  #define	DRIVER_VERSION	"3 May 2006"
>  
>  static const char driver_name [] = "at91_udc";
> -static const char ep0name[] = "ep0";
> +static const char * const ep_names[] = {
> +	"ep0",
> +	"ep1",
> +	"ep2",
> +	"ep3-int",
> +	"ep4",
> +	"ep5",
> +};
> +#define ep0name		ep_names[0]
>  
>  #define VBUS_POLL_TIMEOUT	msecs_to_jiffies(1000)
>  
> @@ -1497,74 +1505,6 @@ static irqreturn_t at91_udc_irq (int irq, void *_udc)
>  
>  /*-------------------------------------------------------------------------*/
>  
> -static struct at91_udc controller = {
> -	.gadget = {
> -		.ops	= &at91_udc_ops,
> -		.ep0	= &controller.ep[0].ep,
> -		.name	= driver_name,
> -	},
> -	.ep[0] = {
> -		.ep = {
> -			.name	= ep0name,
> -			.ops	= &at91_ep_ops,
> -		},
> -		.udc		= &controller,
> -		.maxpacket	= 8,
> -		.int_mask	= 1 << 0,
> -	},
> -	.ep[1] = {
> -		.ep = {
> -			.name	= "ep1",
> -			.ops	= &at91_ep_ops,
> -		},
> -		.udc		= &controller,
> -		.is_pingpong	= 1,
> -		.maxpacket	= 64,
> -		.int_mask	= 1 << 1,
> -	},
> -	.ep[2] = {
> -		.ep = {
> -			.name	= "ep2",
> -			.ops	= &at91_ep_ops,
> -		},
> -		.udc		= &controller,
> -		.is_pingpong	= 1,
> -		.maxpacket	= 64,
> -		.int_mask	= 1 << 2,
> -	},
> -	.ep[3] = {
> -		.ep = {
> -			/* could actually do bulk too */
> -			.name	= "ep3-int",
> -			.ops	= &at91_ep_ops,
> -		},
> -		.udc		= &controller,
> -		.maxpacket	= 8,
> -		.int_mask	= 1 << 3,
> -	},
> -	.ep[4] = {
> -		.ep = {
> -			.name	= "ep4",
> -			.ops	= &at91_ep_ops,
> -		},
> -		.udc		= &controller,
> -		.is_pingpong	= 1,
> -		.maxpacket	= 256,
> -		.int_mask	= 1 << 4,
> -	},
> -	.ep[5] = {
> -		.ep = {
> -			.name	= "ep5",
> -			.ops	= &at91_ep_ops,
> -		},
> -		.udc		= &controller,
> -		.is_pingpong	= 1,
> -		.maxpacket	= 256,
> -		.int_mask	= 1 << 5,
> -	},
> -	/* ep6 and ep7 are also reserved (custom silicon might use them) */
> -};
> -
>  static void at91_vbus_update(struct at91_udc *udc, unsigned value)
>  {
>  	value ^= udc->board.vbus_active_low;
> @@ -1872,15 +1812,31 @@ static int at91udc_probe(struct platform_device *pdev)
>  	struct at91_ep	*ep;
>  	int		i;
>  
> +	udc = devm_kzalloc(dev, sizeof(*udc), GFP_KERNEL);
> +	if (!udc)
> +		return -ENOMEM;
> +
>  	/* init software state */
> -	udc = &controller;
>  	udc->gadget.dev.parent = dev;
>  	at91udc_of_init(udc, pdev->dev.of_node);
>  	udc->pdev = pdev;
>  	udc->enabled = 0;
>  	spin_lock_init(&udc->lock);
>  
> +	udc->gadget.ops = &at91_udc_ops;
> +	udc->gadget.ep0 = &udc->ep[0].ep;
> +	udc->gadget.name = driver_name;
> +	udc->gadget.dev.init_name = "gadget";
>  
> +	for (i = 0; i < NUM_ENDPOINTS; i++) {
> +		ep = &udc->ep[i];
> +		ep->ep.name = ep_names[i];
> +		ep->ep.ops = &at91_ep_ops;
> +		ep->udc = udc;
> +		ep->int_mask = BIT(i);
> +		if (i != 0 && i != 3)
> +			ep->is_pingpong = 1;
> +	}
>  
>  	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
>  	udc->udp_baseaddr = devm_ioremap_resource(dev, res);
> -- 
> 2.1.0
> 

-- 
balbi
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20150114/ffd3a068/attachment.sig>