diff options
| author | Alexandre Belloni | 2015-08-10 16:46:19 +0200 |
|---|---|---|
| committer | Felipe Balbi | 2015-09-27 17:54:31 +0200 |
| commit | 428163d703712d11cacfddaf30f40b18ccc50042 (patch) | |
| tree | 9d8faa2a6d88b422cd197ba841f7518ef2980a4a | |
| parent | usb: dwc2: rename all s3c_* to dwc2_* (diff) | |
| download | kernel-qcow2-linux-428163d703712d11cacfddaf30f40b18ccc50042.tar.gz kernel-qcow2-linux-428163d703712d11cacfddaf30f40b18ccc50042.tar.xz kernel-qcow2-linux-428163d703712d11cacfddaf30f40b18ccc50042.zip | |
usb: gadget: at91_udc: move at91_udc_data in at91_udc.h
struct at91_udc_data is now only used inside the driver, move it to its
include.
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
| -rw-r--r-- | drivers/usb/gadget/udc/at91_udc.h | 8 | ||||
| -rw-r--r-- | include/linux/platform_data/atmel.h | 9 |
2 files changed, 8 insertions, 9 deletions
diff --git a/drivers/usb/gadget/udc/at91_udc.h b/drivers/usb/gadget/udc/at91_udc.h index 2679c8b217cc..0a433e6b346b 100644 --- a/drivers/usb/gadget/udc/at91_udc.h +++ b/drivers/usb/gadget/udc/at91_udc.h @@ -112,6 +112,14 @@ struct at91_udc_caps { void (*pullup)(struct at91_udc *udc, int is_on); }; +struct at91_udc_data { + int vbus_pin; /* high == host powering us */ + u8 vbus_active_low; /* vbus polarity */ + u8 vbus_polled; /* Use polling, not interrupt */ + int pullup_pin; /* active == D+ pulled up */ + u8 pullup_active_low; /* true == pullup_pin is active low */ +}; + /* * driver is non-SMP, and just blocks IRQs whenever it needs * access protection for chip registers or driver state diff --git a/include/linux/platform_data/atmel.h b/include/linux/platform_data/atmel.h index 527a85c61924..9127ebbaa487 100644 --- a/include/linux/platform_data/atmel.h +++ b/include/linux/platform_data/atmel.h @@ -25,15 +25,6 @@ */ #define ATMEL_MAX_UART 7 - /* USB Device */ -struct at91_udc_data { - int vbus_pin; /* high == host powering us */ - u8 vbus_active_low; /* vbus polarity */ - u8 vbus_polled; /* Use polling, not interrupt */ - int pullup_pin; /* active == D+ pulled up */ - u8 pullup_active_low; /* true == pullup_pin is active low */ -}; - /* Compact Flash */ struct at91_cf_data { int irq_pin; /* I/O IRQ */ |