[PATCH v2 4/5] usb: host: xhci: Make U_BOOT_DRIVER entries unique

[Peter Robinson]

On Fri, 26 Sept 2025 at 16:37, Tom Rini <trini at konsulko.com> wrote:
>
> All instances of the U_BOOT_DRIVER must use a unique name or they will
> lead to link time failures due to name space conflicts when both are
> present. Most of the XHCI drivers follow pattern of xhci_xxx in their
> name, but a few used "usb_xhci". Change these to follow the pattern of
> the rest of the XHCI glue drivers.
>
> Signed-off-by: Tom Rini <trini at konsulko.com>
Reviewed-by: Peter Robinson <pbrobinson at gmail.com>
> ---
> Changes in v2:
> - None
>
> Cc: Marek Vasut <marek.vasut at mailbox.org>
> ---
>  drivers/usb/host/xhci-brcm.c    | 2 +-
>  drivers/usb/host/xhci-exynos5.c | 2 +-
>  drivers/usb/host/xhci-generic.c | 2 +-
>  drivers/usb/host/xhci-mtk.c     | 2 +-
>  drivers/usb/host/xhci-mvebu.c   | 2 +-
>  drivers/usb/host/xhci-rcar.c    | 2 +-
>  6 files changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/usb/host/xhci-brcm.c b/drivers/usb/host/xhci-brcm.c
> index 2ffad148dea6..595839fac3c9 100644
> --- a/drivers/usb/host/xhci-brcm.c
> +++ b/drivers/usb/host/xhci-brcm.c
> @@ -85,7 +85,7 @@ static const struct udevice_id xhci_brcm_ids[] = {
>         { }
>  };
>
> -U_BOOT_DRIVER(usb_xhci) = {
> +U_BOOT_DRIVER(xhci_brcm) = {
>         .name                           = "xhci_brcm",
>         .id                             = UCLASS_USB,
>         .probe                          = xhci_brcm_probe,
> diff --git a/drivers/usb/host/xhci-exynos5.c b/drivers/usb/host/xhci-exynos5.c
> index 6a2d422c4b8e..9a7c0f29dc8f 100644
> --- a/drivers/usb/host/xhci-exynos5.c
> +++ b/drivers/usb/host/xhci-exynos5.c
> @@ -247,7 +247,7 @@ static const struct udevice_id xhci_usb_ids[] = {
>         { }
>  };
>
> -U_BOOT_DRIVER(usb_xhci) = {
> +U_BOOT_DRIVER(xhci_exynos) = {
>         .name   = "xhci_exynos",
>         .id     = UCLASS_USB,
>         .of_match = xhci_usb_ids,
> diff --git a/drivers/usb/host/xhci-generic.c b/drivers/usb/host/xhci-generic.c
> index 355d4883176d..8bb4e2774230 100644
> --- a/drivers/usb/host/xhci-generic.c
> +++ b/drivers/usb/host/xhci-generic.c
> @@ -61,7 +61,7 @@ static const struct udevice_id xhci_usb_ids[] = {
>         { }
>  };
>
> -U_BOOT_DRIVER(usb_xhci) = {
> +U_BOOT_DRIVER(xhci_generic) = {
>         .name   = "xhci_generic",
>         .id     = UCLASS_USB,
>         .of_match = xhci_usb_ids,
> diff --git a/drivers/usb/host/xhci-mtk.c b/drivers/usb/host/xhci-mtk.c
> index 7e288f0575b6..ffe80c0bbdc6 100644
> --- a/drivers/usb/host/xhci-mtk.c
> +++ b/drivers/usb/host/xhci-mtk.c
> @@ -357,7 +357,7 @@ static const struct udevice_id xhci_mtk_ids[] = {
>         { }
>  };
>
> -U_BOOT_DRIVER(usb_xhci) = {
> +U_BOOT_DRIVER(xhci_mtk) = {
>         .name = "xhci-mtk",
>         .id = UCLASS_USB,
>         .of_match = xhci_mtk_ids,
> diff --git a/drivers/usb/host/xhci-mvebu.c b/drivers/usb/host/xhci-mvebu.c
> index 1338b1021c64..12dc61aee9db 100644
> --- a/drivers/usb/host/xhci-mvebu.c
> +++ b/drivers/usb/host/xhci-mvebu.c
> @@ -87,7 +87,7 @@ static const struct udevice_id xhci_usb_ids[] = {
>         { }
>  };
>
> -U_BOOT_DRIVER(usb_xhci) = {
> +U_BOOT_DRIVER(xhci_mvebu) = {
>         .name   = "xhci_mvebu",
>         .id     = UCLASS_USB,
>         .of_match = xhci_usb_ids,
> diff --git a/drivers/usb/host/xhci-rcar.c b/drivers/usb/host/xhci-rcar.c
> index b72807053c42..95dfa2c3f874 100644
> --- a/drivers/usb/host/xhci-rcar.c
> +++ b/drivers/usb/host/xhci-rcar.c
> @@ -149,7 +149,7 @@ static const struct udevice_id xhci_rcar_ids[] = {
>         { }
>  };
>
> -U_BOOT_DRIVER(usb_xhci) = {
> +U_BOOT_DRIVER(xhci_rcar) = {
>         .name           = "xhci_rcar",
>         .id             = UCLASS_USB,
>         .probe          = xhci_rcar_probe,
> --
> 2.43.0
>