diff options
| author | Tom Rini <[email protected]> | 2023-01-10 11:19:45 -0500 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2023-01-20 12:27:24 -0500 |
| commit | 6e7df1d151a7a127caf3b62ff6dfc003fc2aefcd (patch) | |
| tree | ae38e9dcf468b2e4e58293561fae87895d9b549f /drivers/usb/ulpi | |
| parent | ad242344681f6a0076a6bf100aa83ac9ecbea355 (diff) | |
global: Finish CONFIG -> CFG migration
At this point, the remaining places where we have a symbol that is
defined as CONFIG_... are in fairly odd locations. While as much dead
code has been removed as possible, some of these locations are simply
less obvious at first. In other cases, this code is used, but was
defined in such a way as to have been missed by earlier checks. Perform
a rename of all such remaining symbols to be CFG_... rather than
CONFIG_...
Signed-off-by: Tom Rini <[email protected]>
Reviewed-by: Simon Glass <[email protected]>
Diffstat (limited to 'drivers/usb/ulpi')
| -rw-r--r-- | drivers/usb/ulpi/omap-ulpi-viewport.c | 2 | ||||
| -rw-r--r-- | drivers/usb/ulpi/ulpi-viewport.c | 2 | ||||
| -rw-r--r-- | drivers/usb/ulpi/ulpi.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/drivers/usb/ulpi/omap-ulpi-viewport.c b/drivers/usb/ulpi/omap-ulpi-viewport.c index 8b930e3fa91..8d71db04a2d 100644 --- a/drivers/usb/ulpi/omap-ulpi-viewport.c +++ b/drivers/usb/ulpi/omap-ulpi-viewport.c @@ -22,7 +22,7 @@ */ static int ulpi_wait(struct ulpi_viewport *ulpi_vp, u32 mask) { - int timeout = CONFIG_USB_ULPI_TIMEOUT; + int timeout = CFG_USB_ULPI_TIMEOUT; while (--timeout) { if (!(readl(ulpi_vp->viewport_addr) & mask)) diff --git a/drivers/usb/ulpi/ulpi-viewport.c b/drivers/usb/ulpi/ulpi-viewport.c index 3bb152be893..55a62808384 100644 --- a/drivers/usb/ulpi/ulpi-viewport.c +++ b/drivers/usb/ulpi/ulpi-viewport.c @@ -34,7 +34,7 @@ */ static int ulpi_wait(struct ulpi_viewport *ulpi_vp, u32 mask) { - int timeout = CONFIG_USB_ULPI_TIMEOUT; + int timeout = CFG_USB_ULPI_TIMEOUT; /* Wait for the bits in mask to become zero. */ while (--timeout) { diff --git a/drivers/usb/ulpi/ulpi.c b/drivers/usb/ulpi/ulpi.c index dd0da0e841e..b5d2c2c2d1c 100644 --- a/drivers/usb/ulpi/ulpi.c +++ b/drivers/usb/ulpi/ulpi.c @@ -207,7 +207,7 @@ int ulpi_suspend(struct ulpi_viewport *ulpi_vp) static int __ulpi_reset_wait(struct ulpi_viewport *ulpi_vp) { u32 val; - int timeout = CONFIG_USB_ULPI_TIMEOUT; + int timeout = CFG_USB_ULPI_TIMEOUT; /* Wait for the RESET bit to become zero */ while (--timeout) { |