[v4,04/46] staging: emxx_udc: add ep capabilities support
diff mbox

Message ID 1437988616-6962-5-git-send-email-r.baldyga@samsung.com
State New
Headers show

Commit Message

Robert Baldyga July 27, 2015, 9:16 a.m. UTC
Convert endpoint configuration to new capabilities model.

Fixed typo in "epc-nulk" to "epc-bulk".

Signed-off-by: Robert Baldyga <r.baldyga@samsung.com>
---
 drivers/staging/emxx_udc/emxx_udc.c | 60 ++++++++++++++++++-------------------
 1 file changed, 29 insertions(+), 31 deletions(-)

Comments

Felipe Balbi July 29, 2015, 3:20 p.m. UTC | #1
On Mon, Jul 27, 2015 at 11:16:14AM +0200, Robert Baldyga wrote:
> Convert endpoint configuration to new capabilities model.
> 
> Fixed typo in "epc-nulk" to "epc-bulk".
> 
> Signed-off-by: Robert Baldyga <r.baldyga@samsung.com>
> ---
>  drivers/staging/emxx_udc/emxx_udc.c | 60 ++++++++++++++++++-------------------
>  1 file changed, 29 insertions(+), 31 deletions(-)
> 
> diff --git a/drivers/staging/emxx_udc/emxx_udc.c b/drivers/staging/emxx_udc/emxx_udc.c
> index 3b7aa36..0d64bee 100644
> --- a/drivers/staging/emxx_udc/emxx_udc.c
> +++ b/drivers/staging/emxx_udc/emxx_udc.c
> @@ -3153,36 +3153,33 @@ static const struct usb_gadget_ops nbu2ss_gadget_ops = {
>  	.ioctl			= nbu2ss_gad_ioctl,
>  };
>  
> -static const char g_ep0_name[] = "ep0";
> -static const char g_ep1_name[] = "ep1-bulk";
> -static const char g_ep2_name[] = "ep2-bulk";
> -static const char g_ep3_name[] = "ep3in-int";
> -static const char g_ep4_name[] = "ep4-iso";
> -static const char g_ep5_name[] = "ep5-iso";
> -static const char g_ep6_name[] = "ep6-bulk";
> -static const char g_ep7_name[] = "ep7-bulk";
> -static const char g_ep8_name[] = "ep8in-int";
> -static const char g_ep9_name[] = "ep9-iso";
> -static const char g_epa_name[] = "epa-iso";
> -static const char g_epb_name[] = "epb-bulk";
> -static const char g_epc_name[] = "epc-nulk";
> -static const char g_epd_name[] = "epdin-int";
> -
> -static const char *gp_ep_name[NUM_ENDPOINTS] = {
> -	g_ep0_name,
> -	g_ep1_name,
> -	g_ep2_name,
> -	g_ep3_name,
> -	g_ep4_name,
> -	g_ep5_name,
> -	g_ep6_name,
> -	g_ep7_name,
> -	g_ep8_name,
> -	g_ep9_name,
> -	g_epa_name,
> -	g_epb_name,
> -	g_epc_name,
> -	g_epd_name,
> +static const struct {
> +	const char *name;
> +	const struct usb_ep_caps caps;
> +} ep_info[NUM_ENDPOINTS] = {
> +#define EP_INFO(_name, _type, _dir) \
> +	{ \
> +		.name = _name, \
> +		.caps = USB_EP_CAPS(USB_EP_CAPS_TYPE_ ## _type, \
> +				USB_EP_CAPS_DIR_ ## _dir), \
> +	}
> +
> +	EP_INFO("ep0",		CONTROL, ALL),
> +	EP_INFO("ep1-bulk",	BULK,	ALL),
> +	EP_INFO("ep2-bulk",	BULK,	ALL),
> +	EP_INFO("ep3in-int",	INT,	IN),
> +	EP_INFO("ep4-iso",	INT,	ALL),
> +	EP_INFO("ep5-iso",	ISO,	ALL),
> +	EP_INFO("ep6-bulk",	ISO,	ALL),
> +	EP_INFO("ep7-bulk",	BULK,	ALL),
> +	EP_INFO("ep8in-int",	INT,	IN),
> +	EP_INFO("ep9-iso",	ISO,	ALL),
> +	EP_INFO("epa-iso",	ISO,	ALL),
> +	EP_INFO("epb-bulk",	BULK,	ALL),
> +	EP_INFO("epc-bulk",	BULK,	ALL),
> +	EP_INFO("epdin-int",	INT,	IN),

IMO, this is pointless obfuscation. It just makes it a pain to grep
source around. Why don't you have UDC drivers initialize the 1-bit flags
directly ?
Robert Baldyga July 30, 2015, 7:15 a.m. UTC | #2
On 07/29/2015 05:20 PM, Felipe Balbi wrote:
> On Mon, Jul 27, 2015 at 11:16:14AM +0200, Robert Baldyga wrote:
>> Convert endpoint configuration to new capabilities model.
>>
>> Fixed typo in "epc-nulk" to "epc-bulk".
>>
>> Signed-off-by: Robert Baldyga <r.baldyga@samsung.com>
>> ---
>>  drivers/staging/emxx_udc/emxx_udc.c | 60 ++++++++++++++++++-------------------
>>  1 file changed, 29 insertions(+), 31 deletions(-)
>>
>> diff --git a/drivers/staging/emxx_udc/emxx_udc.c b/drivers/staging/emxx_udc/emxx_udc.c
>> index 3b7aa36..0d64bee 100644
>> --- a/drivers/staging/emxx_udc/emxx_udc.c
>> +++ b/drivers/staging/emxx_udc/emxx_udc.c
>> @@ -3153,36 +3153,33 @@ static const struct usb_gadget_ops nbu2ss_gadget_ops = {
>>  	.ioctl			= nbu2ss_gad_ioctl,
>>  };
>>  
>> -static const char g_ep0_name[] = "ep0";
>> -static const char g_ep1_name[] = "ep1-bulk";
>> -static const char g_ep2_name[] = "ep2-bulk";
>> -static const char g_ep3_name[] = "ep3in-int";
>> -static const char g_ep4_name[] = "ep4-iso";
>> -static const char g_ep5_name[] = "ep5-iso";
>> -static const char g_ep6_name[] = "ep6-bulk";
>> -static const char g_ep7_name[] = "ep7-bulk";
>> -static const char g_ep8_name[] = "ep8in-int";
>> -static const char g_ep9_name[] = "ep9-iso";
>> -static const char g_epa_name[] = "epa-iso";
>> -static const char g_epb_name[] = "epb-bulk";
>> -static const char g_epc_name[] = "epc-nulk";
>> -static const char g_epd_name[] = "epdin-int";
>> -
>> -static const char *gp_ep_name[NUM_ENDPOINTS] = {
>> -	g_ep0_name,
>> -	g_ep1_name,
>> -	g_ep2_name,
>> -	g_ep3_name,
>> -	g_ep4_name,
>> -	g_ep5_name,
>> -	g_ep6_name,
>> -	g_ep7_name,
>> -	g_ep8_name,
>> -	g_ep9_name,
>> -	g_epa_name,
>> -	g_epb_name,
>> -	g_epc_name,
>> -	g_epd_name,
>> +static const struct {
>> +	const char *name;
>> +	const struct usb_ep_caps caps;
>> +} ep_info[NUM_ENDPOINTS] = {
>> +#define EP_INFO(_name, _type, _dir) \
>> +	{ \
>> +		.name = _name, \
>> +		.caps = USB_EP_CAPS(USB_EP_CAPS_TYPE_ ## _type, \
>> +				USB_EP_CAPS_DIR_ ## _dir), \
>> +	}
>> +
>> +	EP_INFO("ep0",		CONTROL, ALL),
>> +	EP_INFO("ep1-bulk",	BULK,	ALL),
>> +	EP_INFO("ep2-bulk",	BULK,	ALL),
>> +	EP_INFO("ep3in-int",	INT,	IN),
>> +	EP_INFO("ep4-iso",	INT,	ALL),
>> +	EP_INFO("ep5-iso",	ISO,	ALL),
>> +	EP_INFO("ep6-bulk",	ISO,	ALL),
>> +	EP_INFO("ep7-bulk",	BULK,	ALL),
>> +	EP_INFO("ep8in-int",	INT,	IN),
>> +	EP_INFO("ep9-iso",	ISO,	ALL),
>> +	EP_INFO("epa-iso",	ISO,	ALL),
>> +	EP_INFO("epb-bulk",	BULK,	ALL),
>> +	EP_INFO("epc-bulk",	BULK,	ALL),
>> +	EP_INFO("epdin-int",	INT,	IN),
> 
> IMO, this is pointless obfuscation. It just makes it a pain to grep
> source around. Why don't you have UDC drivers initialize the 1-bit flags
> directly ?
> 

Do you mean something like this? It just makes it a pain to scroll this
source ;)

static const struct {
	const char *name;
	const struct usb_ep_caps caps;
} ep_info[NUM_ENDPOINTS] = {
	{
		.name = "ep0",
		.caps = {
			.type_control = true,
			.dir_in = true,
			.dir_out = true,
		},
	},
	{
		.name = "ep1-bulk",
		.caps = {
			.type_bulk = true,
			.dir_in = true,
			.dir_out = true,
		},
	},
	{
		.name = "ep2-bulk",
		.caps = {
			.type_bulk = true,
			.dir_in = true,
			.dir_out = true,
		},
	},
	{
		.name = "ep3in-int",
		.caps = {
			.type_int = true,
			.dir_in = true,
		},
	},
	{
		.name = "ep4-iso",
		.caps = {
			.type_iso = true,
			.dir_in = true,
			.dir_out = true,
		},
	},
	{
		.name = "ep5-iso",
		.caps = {
			.type_iso = true,
			.dir_in = true,
			.dir_out = true,
		},
	},
	{
		.name = "ep6-bulk",
		.caps = {
			.type_bulk = true,
			.dir_in = true,
			.dir_out = true,
		},
	},
	{
		.name = "ep7-bulk",
		.caps = {
			.type_bulk = true,
			.dir_in = true,
			.dir_out = true,
		},
	},
	{
		.name = "ep8in-int",
		.caps = {
			.type_int = true,
			.dir_in = true,
		},
	},
	{
		.name = "ep9-iso",
		.caps = {
			.type_iso = true,
			.dir_in = true,
			.dir_out = true,
		},
	},
	{
		.name = "epa-iso",
		.caps = {
			.type_iso = true,
			.dir_in = true,
			.dir_out = true,
		},
	},
	{
		.name = "epb-bulk",
		.caps = {
			.type_bulk = true,
			.dir_in = true,
			.dir_out = true,
		},
	},
	{
		.name = "epc-bulk",
		.caps = {
			.type_bulk = true,
			.dir_in = true,
			.dir_out = true,
		},
	},
	{
		.name = epdin-int,
		.caps = {
			.type_int = true,
			.dir_in = true,
		},
	},
};

Thanks,
Robert
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Felipe Balbi July 30, 2015, 2:08 p.m. UTC | #3
Hi,

On Thu, Jul 30, 2015 at 09:15:38AM +0200, Robert Baldyga wrote:
> On 07/29/2015 05:20 PM, Felipe Balbi wrote:
> > On Mon, Jul 27, 2015 at 11:16:14AM +0200, Robert Baldyga wrote:
> >> Convert endpoint configuration to new capabilities model.
> >>
> >> Fixed typo in "epc-nulk" to "epc-bulk".
> >>
> >> Signed-off-by: Robert Baldyga <r.baldyga@samsung.com>
> >> ---
> >>  drivers/staging/emxx_udc/emxx_udc.c | 60 ++++++++++++++++++-------------------
> >>  1 file changed, 29 insertions(+), 31 deletions(-)
> >>
> >> diff --git a/drivers/staging/emxx_udc/emxx_udc.c b/drivers/staging/emxx_udc/emxx_udc.c
> >> index 3b7aa36..0d64bee 100644
> >> --- a/drivers/staging/emxx_udc/emxx_udc.c
> >> +++ b/drivers/staging/emxx_udc/emxx_udc.c
> >> @@ -3153,36 +3153,33 @@ static const struct usb_gadget_ops nbu2ss_gadget_ops = {
> >>  	.ioctl			= nbu2ss_gad_ioctl,
> >>  };
> >>  
> >> -static const char g_ep0_name[] = "ep0";
> >> -static const char g_ep1_name[] = "ep1-bulk";
> >> -static const char g_ep2_name[] = "ep2-bulk";
> >> -static const char g_ep3_name[] = "ep3in-int";
> >> -static const char g_ep4_name[] = "ep4-iso";
> >> -static const char g_ep5_name[] = "ep5-iso";
> >> -static const char g_ep6_name[] = "ep6-bulk";
> >> -static const char g_ep7_name[] = "ep7-bulk";
> >> -static const char g_ep8_name[] = "ep8in-int";
> >> -static const char g_ep9_name[] = "ep9-iso";
> >> -static const char g_epa_name[] = "epa-iso";
> >> -static const char g_epb_name[] = "epb-bulk";
> >> -static const char g_epc_name[] = "epc-nulk";
> >> -static const char g_epd_name[] = "epdin-int";
> >> -
> >> -static const char *gp_ep_name[NUM_ENDPOINTS] = {
> >> -	g_ep0_name,
> >> -	g_ep1_name,
> >> -	g_ep2_name,
> >> -	g_ep3_name,
> >> -	g_ep4_name,
> >> -	g_ep5_name,
> >> -	g_ep6_name,
> >> -	g_ep7_name,
> >> -	g_ep8_name,
> >> -	g_ep9_name,
> >> -	g_epa_name,
> >> -	g_epb_name,
> >> -	g_epc_name,
> >> -	g_epd_name,
> >> +static const struct {
> >> +	const char *name;
> >> +	const struct usb_ep_caps caps;
> >> +} ep_info[NUM_ENDPOINTS] = {
> >> +#define EP_INFO(_name, _type, _dir) \
> >> +	{ \
> >> +		.name = _name, \
> >> +		.caps = USB_EP_CAPS(USB_EP_CAPS_TYPE_ ## _type, \
> >> +				USB_EP_CAPS_DIR_ ## _dir), \
> >> +	}
> >> +
> >> +	EP_INFO("ep0",		CONTROL, ALL),
> >> +	EP_INFO("ep1-bulk",	BULK,	ALL),
> >> +	EP_INFO("ep2-bulk",	BULK,	ALL),
> >> +	EP_INFO("ep3in-int",	INT,	IN),
> >> +	EP_INFO("ep4-iso",	INT,	ALL),
> >> +	EP_INFO("ep5-iso",	ISO,	ALL),
> >> +	EP_INFO("ep6-bulk",	ISO,	ALL),
> >> +	EP_INFO("ep7-bulk",	BULK,	ALL),
> >> +	EP_INFO("ep8in-int",	INT,	IN),
> >> +	EP_INFO("ep9-iso",	ISO,	ALL),
> >> +	EP_INFO("epa-iso",	ISO,	ALL),
> >> +	EP_INFO("epb-bulk",	BULK,	ALL),
> >> +	EP_INFO("epc-bulk",	BULK,	ALL),
> >> +	EP_INFO("epdin-int",	INT,	IN),
> > 
> > IMO, this is pointless obfuscation. It just makes it a pain to grep
> > source around. Why don't you have UDC drivers initialize the 1-bit flags
> > directly ?
> > 
> 
> Do you mean something like this? It just makes it a pain to scroll this
> source ;)

but it's at least easy to grep. Another option would be the following:

EP_INFO("ep0", USB_EP_CAPS(USB_EP_CAPS_TYPE_CONTROL,
			USB_EP_CAPS_DIR_ALL)),

that also helps grepping.

Patch
diff mbox

diff --git a/drivers/staging/emxx_udc/emxx_udc.c b/drivers/staging/emxx_udc/emxx_udc.c
index 3b7aa36..0d64bee 100644
--- a/drivers/staging/emxx_udc/emxx_udc.c
+++ b/drivers/staging/emxx_udc/emxx_udc.c
@@ -3153,36 +3153,33 @@  static const struct usb_gadget_ops nbu2ss_gadget_ops = {
 	.ioctl			= nbu2ss_gad_ioctl,
 };
 
-static const char g_ep0_name[] = "ep0";
-static const char g_ep1_name[] = "ep1-bulk";
-static const char g_ep2_name[] = "ep2-bulk";
-static const char g_ep3_name[] = "ep3in-int";
-static const char g_ep4_name[] = "ep4-iso";
-static const char g_ep5_name[] = "ep5-iso";
-static const char g_ep6_name[] = "ep6-bulk";
-static const char g_ep7_name[] = "ep7-bulk";
-static const char g_ep8_name[] = "ep8in-int";
-static const char g_ep9_name[] = "ep9-iso";
-static const char g_epa_name[] = "epa-iso";
-static const char g_epb_name[] = "epb-bulk";
-static const char g_epc_name[] = "epc-nulk";
-static const char g_epd_name[] = "epdin-int";
-
-static const char *gp_ep_name[NUM_ENDPOINTS] = {
-	g_ep0_name,
-	g_ep1_name,
-	g_ep2_name,
-	g_ep3_name,
-	g_ep4_name,
-	g_ep5_name,
-	g_ep6_name,
-	g_ep7_name,
-	g_ep8_name,
-	g_ep9_name,
-	g_epa_name,
-	g_epb_name,
-	g_epc_name,
-	g_epd_name,
+static const struct {
+	const char *name;
+	const struct usb_ep_caps caps;
+} ep_info[NUM_ENDPOINTS] = {
+#define EP_INFO(_name, _type, _dir) \
+	{ \
+		.name = _name, \
+		.caps = USB_EP_CAPS(USB_EP_CAPS_TYPE_ ## _type, \
+				USB_EP_CAPS_DIR_ ## _dir), \
+	}
+
+	EP_INFO("ep0",		CONTROL, ALL),
+	EP_INFO("ep1-bulk",	BULK,	ALL),
+	EP_INFO("ep2-bulk",	BULK,	ALL),
+	EP_INFO("ep3in-int",	INT,	IN),
+	EP_INFO("ep4-iso",	INT,	ALL),
+	EP_INFO("ep5-iso",	ISO,	ALL),
+	EP_INFO("ep6-bulk",	ISO,	ALL),
+	EP_INFO("ep7-bulk",	BULK,	ALL),
+	EP_INFO("ep8in-int",	INT,	IN),
+	EP_INFO("ep9-iso",	ISO,	ALL),
+	EP_INFO("epa-iso",	ISO,	ALL),
+	EP_INFO("epb-bulk",	BULK,	ALL),
+	EP_INFO("epc-bulk",	BULK,	ALL),
+	EP_INFO("epdin-int",	INT,	IN),
+
+#undef EP_INFO
 };
 
 /*-------------------------------------------------------------------------*/
@@ -3200,7 +3197,8 @@  static void __init nbu2ss_drv_ep_init(struct nbu2ss_udc *udc)
 		ep->desc = NULL;
 
 		ep->ep.driver_data = NULL;
-		ep->ep.name = gp_ep_name[i];
+		ep->ep.name = ep_info[i].name;
+		ep->ep.caps = ep_info[i].caps;
 		ep->ep.ops = &nbu2ss_ep_ops;
 
 		usb_ep_set_maxpacket_limit(&ep->ep,