usb: musb: Rename CONFIG_USB_MUSB_TIMEOUT to MUSB_TIMEOUT

This variable has never been configured to another value at present, and
was not converted to Kconfig. Opt instead to rename this to
MUSB_TIMEOUT.

Cc: Marek Vasut <marex@denx.de>
Signed-off-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Marek Vasut <marex@denx.de>
This commit is contained in:
Tom Rini 2023-01-10 11:19:38 -05:00
parent 8fe042be9a
commit 8de73b7bc1
2 changed files with 4 additions and 6 deletions

View File

@ -118,7 +118,7 @@ static int wait_until_ep0_ready(struct usb_device *dev, u32 bit_mask)
{ {
u16 csr; u16 csr;
int result = 1; int result = 1;
int timeout = CONFIG_USB_MUSB_TIMEOUT; int timeout = MUSB_TIMEOUT;
while (result > 0) { while (result > 0) {
csr = readw(&musbr->txcsr); csr = readw(&musbr->txcsr);
@ -180,7 +180,7 @@ static int wait_until_ep0_ready(struct usb_device *dev, u32 bit_mask)
static int wait_until_txep_ready(struct usb_device *dev, u8 ep) static int wait_until_txep_ready(struct usb_device *dev, u8 ep)
{ {
u16 csr; u16 csr;
int timeout = CONFIG_USB_MUSB_TIMEOUT; int timeout = MUSB_TIMEOUT;
do { do {
if (check_stall(ep, 1)) { if (check_stall(ep, 1)) {
@ -212,7 +212,7 @@ static int wait_until_txep_ready(struct usb_device *dev, u8 ep)
static int wait_until_rxep_ready(struct usb_device *dev, u8 ep) static int wait_until_rxep_ready(struct usb_device *dev, u8 ep)
{ {
u16 csr; u16 csr;
int timeout = CONFIG_USB_MUSB_TIMEOUT; int timeout = MUSB_TIMEOUT;
do { do {
if (check_stall(ep, 0)) { if (check_stall(ep, 0)) {

View File

@ -16,9 +16,7 @@
extern unsigned char new[]; extern unsigned char new[];
#endif #endif
#ifndef CONFIG_USB_MUSB_TIMEOUT #define MUSB_TIMEOUT 100000
# define CONFIG_USB_MUSB_TIMEOUT 100000
#endif
/* This defines the endpoint number used for control transfers */ /* This defines the endpoint number used for control transfers */
#define MUSB_CONTROL_EP 0 #define MUSB_CONTROL_EP 0