Commit 0944bf45 authored by David Brownell's avatar David Brownell Committed by Greg Kroah-Hartman

[PATCH] USB gadget: zero config updates

Use new boolean CONFIG_* symbols.
parent ee4cefc7
...@@ -131,7 +131,7 @@ static const char loopback [] = "loop input to output"; ...@@ -131,7 +131,7 @@ static const char loopback [] = "loop input to output";
* DMA channels to manage their FIFOs. It supports high speed. * DMA channels to manage their FIFOs. It supports high speed.
* Those endpoints can be arranged in any desired configuration. * Those endpoints can be arranged in any desired configuration.
*/ */
#ifdef CONFIG_USB_ZERO_NET2280 #if defined(CONFIG_USB_GADGET_NET2280) || defined(CONFIG_USB_GADGET_DUMMY_HCD)
#define CHIP "net2280" #define CHIP "net2280"
#define DRIVER_VERSION_NUM 0x0101 #define DRIVER_VERSION_NUM 0x0101
static const char EP_OUT_NAME [] = "ep-a"; static const char EP_OUT_NAME [] = "ep-a";
...@@ -154,7 +154,7 @@ static const char EP_IN_NAME [] = "ep-b"; ...@@ -154,7 +154,7 @@ static const char EP_IN_NAME [] = "ep-b";
* can't use altsettings or reset the interfaces independently. * can't use altsettings or reset the interfaces independently.
* So stick to a single interface. * So stick to a single interface.
*/ */
#ifdef CONFIG_USB_ZERO_PXA2XX #ifdef CONFIG_USB_GADGET_PXA2XX
#define CHIP "pxa2xx" #define CHIP "pxa2xx"
#define DRIVER_VERSION_NUM 0x0103 #define DRIVER_VERSION_NUM 0x0103
static const char EP_OUT_NAME [] = "ep12out-bulk"; static const char EP_OUT_NAME [] = "ep12out-bulk";
...@@ -176,7 +176,7 @@ static const char EP_IN_NAME [] = "ep11in-bulk"; ...@@ -176,7 +176,7 @@ static const char EP_IN_NAME [] = "ep11in-bulk";
* in special situations. So this is a case of "choose it right * in special situations. So this is a case of "choose it right
* during enumeration" ... * during enumeration" ...
*/ */
#ifdef CONFIG_USB_ZERO_SA1100 #ifdef CONFIG_USB_GADGET_SA1100
#define CHIP "sa1100" #define CHIP "sa1100"
#define DRIVER_VERSION_NUM 0x0105 #define DRIVER_VERSION_NUM 0x0105
static const char EP_OUT_NAME [] = "ep1out-bulk"; static const char EP_OUT_NAME [] = "ep1out-bulk";
...@@ -192,7 +192,7 @@ static const char EP_IN_NAME [] = "ep2in-bulk"; ...@@ -192,7 +192,7 @@ static const char EP_IN_NAME [] = "ep2in-bulk";
* *
* This has three semi-configurable full speed bulk/interrupt endpoints. * This has three semi-configurable full speed bulk/interrupt endpoints.
*/ */
#ifdef CONFIG_USB_ZERO_GOKU #ifdef CONFIG_USB_GADGET_GOKU
#define CHIP "goku" #define CHIP "goku"
#define DRIVER_VERSION_NUM 0x0106 #define DRIVER_VERSION_NUM 0x0106
static const char EP_OUT_NAME [] = "ep1-bulk"; static const char EP_OUT_NAME [] = "ep1-bulk";
...@@ -936,7 +936,7 @@ zero_set_config (struct zero_dev *dev, unsigned number, int gfp_flags) ...@@ -936,7 +936,7 @@ zero_set_config (struct zero_dev *dev, unsigned number, int gfp_flags)
if (number == dev->config) if (number == dev->config)
return 0; return 0;
#ifdef CONFIG_USB_ZERO_SA1100 #ifdef CONFIG_USB_GADGET_SA1100
if (dev->config) { if (dev->config) {
/* tx fifo is full, but we can't clear it...*/ /* tx fifo is full, but we can't clear it...*/
INFO (dev, "can't change configurations\n"); INFO (dev, "can't change configurations\n");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment