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/gadget | |
| 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/gadget')
| -rw-r--r-- | drivers/usb/gadget/ci_udc.c | 10 | ||||
| -rw-r--r-- | drivers/usb/gadget/ci_udc.h | 6 |
2 files changed, 8 insertions, 8 deletions
diff --git a/drivers/usb/gadget/ci_udc.c b/drivers/usb/gadget/ci_udc.c index d9a89a17b27..b9258d73575 100644 --- a/drivers/usb/gadget/ci_udc.c +++ b/drivers/usb/gadget/ci_udc.c @@ -322,7 +322,7 @@ static void ep_enable(int num, int in, int maxpacket) if (num != 0) { struct ept_queue_head *head = ci_get_qh(num, in); - head->config = CONFIG_MAX_PKT(maxpacket) | CONFIG_ZLT; + head->config = CFG_MAX_PKT(maxpacket) | CFG_ZLT; ci_flush_qh(num); } writel(n, &udc->epctrl[num]); @@ -959,11 +959,11 @@ static int ci_udc_probe(void) */ head = controller.epts + i; if (i < 2) - head->config = CONFIG_MAX_PKT(EP0_MAX_PACKET_SIZE) - | CONFIG_ZLT | CONFIG_IOS; + head->config = CFG_MAX_PKT(EP0_MAX_PACKET_SIZE) + | CFG_ZLT | CFG_IOS; else - head->config = CONFIG_MAX_PKT(EP_MAX_PACKET_SIZE) - | CONFIG_ZLT; + head->config = CFG_MAX_PKT(EP_MAX_PACKET_SIZE) + | CFG_ZLT; head->next = TERMINATE; head->info = 0; diff --git a/drivers/usb/gadget/ci_udc.h b/drivers/usb/gadget/ci_udc.h index 95cc07992b4..bea2f9f3fe3 100644 --- a/drivers/usb/gadget/ci_udc.h +++ b/drivers/usb/gadget/ci_udc.h @@ -128,9 +128,9 @@ struct ept_queue_head { unsigned reserved_4; }; -#define CONFIG_MAX_PKT(n) ((n) << 16) -#define CONFIG_ZLT (1 << 29) /* stop on zero-len xfer */ -#define CONFIG_IOS (1 << 15) /* IRQ on setup */ +#define CFG_MAX_PKT(n) ((n) << 16) +#define CFG_ZLT (1 << 29) /* stop on zero-len xfer */ +#define CFG_IOS (1 << 15) /* IRQ on setup */ struct ept_queue_item { unsigned next; |