Re: [PATCH] phy: twl4030-usb: make driver DT only

[Kishon Vijay Abraham I]

Hi,

On Saturday 12 November 2016 04:09 PM, Nicolae Rosia wrote:
> All users are DT-only and it makes no sense to keep
> unused code

Are you sure about this? I still see a bunch of board files in mach-omap2 using
twl4030.

Thanks
Kishon
> 
> Signed-off-by: Nicolae Rosia <Nicolae_Rosia@xxxxxxxxxx>
> ---
>  drivers/phy/Kconfig           |  1 +
>  drivers/phy/phy-twl4030-usb.c | 22 +++++++---------------
>  2 files changed, 8 insertions(+), 15 deletions(-)
> 
> diff --git a/drivers/phy/Kconfig b/drivers/phy/Kconfig
> index fe00f91..265391e 100644
> --- a/drivers/phy/Kconfig
> +++ b/drivers/phy/Kconfig
> @@ -196,6 +196,7 @@ config TWL4030_USB
>  	depends on TWL4030_CORE && REGULATOR_TWL4030 && USB_MUSB_OMAP2PLUS
>  	depends on USB_SUPPORT
>  	depends on USB_GADGET || !USB_GADGET # if USB_GADGET=m, this can't 'y'
> +	depends on OF
>  	select GENERIC_PHY
>  	select USB_PHY
>  	help
> diff --git a/drivers/phy/phy-twl4030-usb.c b/drivers/phy/phy-twl4030-usb.c
> index 87e6334..a5e4927 100644
> --- a/drivers/phy/phy-twl4030-usb.c
> +++ b/drivers/phy/phy-twl4030-usb.c
> @@ -656,7 +656,6 @@ static const struct dev_pm_ops twl4030_usb_pm_ops = {
>  
>  static int twl4030_usb_probe(struct platform_device *pdev)
>  {
> -	struct twl4030_usb_data *pdata = dev_get_platdata(&pdev->dev);
>  	struct twl4030_usb	*twl;
>  	struct phy		*phy;
>  	int			status, err;
> @@ -664,19 +663,17 @@ static int twl4030_usb_probe(struct platform_device *pdev)
>  	struct device_node	*np = pdev->dev.of_node;
>  	struct phy_provider	*phy_provider;
>  
> +	if (!np) {
> +		dev_err(&pdev->dev, "no DT info\n");
> +		return -EINVAL;
> +	}
> +
>  	twl = devm_kzalloc(&pdev->dev, sizeof(*twl), GFP_KERNEL);
>  	if (!twl)
>  		return -ENOMEM;
>  
> -	if (np)
> -		of_property_read_u32(np, "usb_mode",
> -				(enum twl4030_usb_mode *)&twl->usb_mode);
> -	else if (pdata) {
> -		twl->usb_mode = pdata->usb_mode;
> -	} else {
> -		dev_err(&pdev->dev, "twl4030 initialized without pdata\n");
> -		return -EINVAL;
> -	}
> +	of_property_read_u32(np, "usb_mode",
> +			(enum twl4030_usb_mode *)&twl->usb_mode);
>  
>  	otg = devm_kzalloc(&pdev->dev, sizeof(*otg), GFP_KERNEL);
>  	if (!otg)
> @@ -750,11 +747,6 @@ static int twl4030_usb_probe(struct platform_device *pdev)
>  		return status;
>  	}
>  
> -	if (pdata)
> -		err = phy_create_lookup(phy, "usb", "musb-hdrc.0");
> -	if (err)
> -		return err;
> -
>  	pm_runtime_mark_last_busy(&pdev->dev);
>  	pm_runtime_put_autosuspend(twl->dev);
>  
>