dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-09-01 16:52:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

usb: ehci-omap: Drop dead code

Browse Source 
omap_ehci_hcd_stop appears to be dead code, and omap_ehci_hcd_init
is only called by the probe function, so it can be static to that
function.  Remove both from the header along with some additional
checking for DM_USB.

Signed-off-by: Adam Ford <aford173@gmail.com>
This commit is contained in:
Adam Ford
2022-02-19 17:08:41 -06:00
committed by Marek Vasut
parent 17a0dc6abf
commit 0935dbf4c9
2 changed files with 1 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
arch/arm/include/asm/ehci-omap.h
View File

@@ -123,17 +123,4 @@ struct omap_ehci {
u32 insreg08; /* 0xb0 */ u32 insreg08; /* 0xb0 */
}; };
#if !CONFIG_IS_ENABLED(DM_USB) || !CONFIG_IS_ENABLED(OF_CONTROL)
/*
* FIXME: forward declaration of this structs needed because omap got the
* ehci implementation backwards. move out ehci_hcd_x from board files
*/
struct ehci_hccr;
struct ehci_hcor;
int omap_ehci_hcd_init(int index, struct omap_usbhs_board_data *usbhs_pdata,
struct ehci_hccr **hccr, struct ehci_hcor **hcor);
int omap_ehci_hcd_stop(void);
#endif
#endif /* _OMAP_COMMON_EHCI_H_ */ #endif /* _OMAP_COMMON_EHCI_H_ */

17
drivers/usb/host/ehci-omap.c
View File

@@ -163,27 +163,12 @@ static inline void omap_ehci_phy_reset(int on, int delay)
#define omap_ehci_phy_reset(on, delay) do {} while (0) #define omap_ehci_phy_reset(on, delay) do {} while (0)
#endif #endif
/* Reset is needed otherwise the kernel-driver will throw an error. */
int omap_ehci_hcd_stop(void)
{
debug("Resetting OMAP EHCI\n");
omap_ehci_phy_reset(1, 0);
if (omap_uhh_reset() < 0)
return -1;
if (omap_ehci_tll_reset() < 0)
return -1;
return 0;
}
/* /*
* Initialize the OMAP EHCI controller and PHY. * Initialize the OMAP EHCI controller and PHY.
* Based on "drivers/usb/host/ehci-omap.c" from Linux 3.1 * Based on "drivers/usb/host/ehci-omap.c" from Linux 3.1
* See there for additional Copyrights. * See there for additional Copyrights.
*/ */
int omap_ehci_hcd_init(int index, struct omap_usbhs_board_data *usbhs_pdata) static int omap_ehci_hcd_init(int index, struct omap_usbhs_board_data *usbhs_pdata)
{ {
int ret; int ret;
unsigned int i, reg = 0, rev = 0; unsigned int i, reg = 0, rev = 0;