Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

USB: host: ohci-at91: move at91_usbh_data definition in c file

Move struct at91_usbh_data back in ohci-at91.c as this is the only user
left after switching all at91 platforms to DT only.

Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Acked-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Alexandre Belloni and committed by
Greg Kroah-Hartman
b4f19470 3cf1fc80

+11 -12
+11
drivers/usb/host/ohci-at91.c
··· 36 36 #define hcd_to_ohci_at91_priv(h) \ 37 37 ((struct ohci_at91_priv *)hcd_to_ohci(h)->priv) 38 38 39 + #define AT91_MAX_USBH_PORTS 3 40 + struct at91_usbh_data { 41 + int vbus_pin[AT91_MAX_USBH_PORTS]; /* port power-control pin */ 42 + int overcurrent_pin[AT91_MAX_USBH_PORTS]; 43 + u8 ports; /* number of ports on root hub */ 44 + u8 overcurrent_supported; 45 + u8 vbus_pin_active_low[AT91_MAX_USBH_PORTS]; 46 + u8 overcurrent_status[AT91_MAX_USBH_PORTS]; 47 + u8 overcurrent_changed[AT91_MAX_USBH_PORTS]; 48 + }; 49 + 39 50 struct ohci_at91_priv { 40 51 struct clk *iclk; 41 52 struct clk *fclk;
-12
include/linux/platform_data/atmel.h
··· 46 46 #define AT91_IDE_SWAP_A0_A2 0x02 47 47 }; 48 48 49 - /* USB Host */ 50 - #define AT91_MAX_USBH_PORTS 3 51 - struct at91_usbh_data { 52 - int vbus_pin[AT91_MAX_USBH_PORTS]; /* port power-control pin */ 53 - int overcurrent_pin[AT91_MAX_USBH_PORTS]; 54 - u8 ports; /* number of ports on root hub */ 55 - u8 overcurrent_supported; 56 - u8 vbus_pin_active_low[AT91_MAX_USBH_PORTS]; 57 - u8 overcurrent_status[AT91_MAX_USBH_PORTS]; 58 - u8 overcurrent_changed[AT91_MAX_USBH_PORTS]; 59 - }; 60 - 61 49 /* NAND / SmartMedia */ 62 50 struct atmel_nand_data { 63 51 int enable_pin; /* chip enable */