[U-Boot] [PATCH 01/16] usb: xhci-pci: Drop non-DM version of xhci-pci driver

[Marek Vasut]

On 06/23/2017 11:54 AM, Bin Meng wrote:
> As there is no board that currently uses xhci-pci driver without DM
> USB, drop its support and leave only DM support.

You should add something into the Kconfig to make this driver depend on
DM_USB ; unless it's already there.

> Signed-off-by: Bin Meng <bmeng.cn at gmail.com>
> ---
> 
>  drivers/usb/host/xhci-pci.c | 52 ---------------------------------------------
>  1 file changed, 52 deletions(-)
> 
> diff --git a/drivers/usb/host/xhci-pci.c b/drivers/usb/host/xhci-pci.c
> index 63daaa6..5ad8452 100644
> --- a/drivers/usb/host/xhci-pci.c
> +++ b/drivers/usb/host/xhci-pci.c
> @@ -14,56 +14,6 @@
>  
>  #include "xhci.h"
>  
> -#ifndef CONFIG_DM_USB
> -
> -/*
> - * Create the appropriate control structures to manage a new XHCI host
> - * controller.
> - */
> -int xhci_hcd_init(int index, struct xhci_hccr **ret_hccr,
> -		  struct xhci_hcor **ret_hcor)
> -{
> -	struct xhci_hccr *hccr;
> -	struct xhci_hcor *hcor;
> -	pci_dev_t pdev;
> -	uint32_t cmd;
> -	int len;
> -
> -	pdev = pci_find_class(PCI_CLASS_SERIAL_USB_XHCI, index);
> -	if (pdev < 0) {
> -		printf("XHCI host controller not found\n");
> -		return -1;
> -	}
> -
> -	hccr = (struct xhci_hccr *)pci_map_bar(pdev,
> -			PCI_BASE_ADDRESS_0, PCI_REGION_MEM);
> -	len = HC_LENGTH(xhci_readl(&hccr->cr_capbase));
> -	hcor = (struct xhci_hcor *)((uint32_t)hccr + len);
> -
> -	debug("XHCI-PCI init hccr 0x%x and hcor 0x%x hc_length %d\n",
> -	      (uint32_t)hccr, (uint32_t)hcor, len);
> -
> -	*ret_hccr = hccr;
> -	*ret_hcor = hcor;
> -
> -	/* enable busmaster */
> -	pci_read_config_dword(pdev, PCI_COMMAND, &cmd);
> -	cmd |= PCI_COMMAND_MASTER;
> -	pci_write_config_dword(pdev, PCI_COMMAND, cmd);
> -
> -	return 0;
> -}
> -
> -/*
> - * Destroy the appropriate control structures corresponding * to the XHCI host
> - * controller
> - */
> -void xhci_hcd_stop(int index)
> -{
> -}
> -
> -#else
> -
>  struct xhci_pci_priv {
>  	struct xhci_ctrl ctrl;	/* Needs to come first in this struct! */
>  };
> @@ -137,5 +87,3 @@ static struct pci_device_id xhci_pci_supported[] = {
>  };
>  
>  U_BOOT_PCI_DEVICE(xhci_pci, xhci_pci_supported);
> -
> -#endif /* CONFIG_DM_USB */
> 


-- 
Best regards,
Marek Vasut