Re: [PATCHv5 4/7] arm: omap3: twl: remove usb phy init data

[Kishon Vijay Abraham I]

Hi Tony,

On Wednesday 19 November 2014 08:58 PM, Heikki Krogerus wrote:
> The driver does no use it any more.
> 
> Signed-off-by: Heikki Krogerus <heikki.krogerus@xxxxxxxxxxxxxxx>

This version is slightly different from the one you gave your Acked-by.

So are you okay if I merge this with your Acked-by?

Thanks
Kishon
> ---
>  arch/arm/mach-omap2/twl-common.c | 12 +-----------
>  include/linux/i2c/twl.h          |  2 --
>  2 files changed, 1 insertion(+), 13 deletions(-)
> 
> diff --git a/arch/arm/mach-omap2/twl-common.c b/arch/arm/mach-omap2/twl-common.c
> index b0d54da..4457e73 100644
> --- a/arch/arm/mach-omap2/twl-common.c
> +++ b/arch/arm/mach-omap2/twl-common.c
> @@ -91,18 +91,8 @@ void __init omap_pmic_late_init(void)
>  }
>  
>  #if defined(CONFIG_ARCH_OMAP3)
> -struct phy_consumer consumers[] = {
> -	PHY_CONSUMER("musb-hdrc.0", "usb"),
> -};
> -
> -struct phy_init_data init_data = {
> -	.consumers = consumers,
> -	.num_consumers = ARRAY_SIZE(consumers),
> -};
> -
>  static struct twl4030_usb_data omap3_usb_pdata = {
> -	.usb_mode	= T2_USB_MODE_ULPI,
> -	.init_data	= &init_data,
> +	.usb_mode = T2_USB_MODE_ULPI,
>  };
>  
>  static int omap3_batt_table[] = {
> diff --git a/include/linux/i2c/twl.h b/include/linux/i2c/twl.h
> index 8cfb50f..0bc03f1 100644
> --- a/include/linux/i2c/twl.h
> +++ b/include/linux/i2c/twl.h
> @@ -26,7 +26,6 @@
>  #define __TWL_H_
>  
>  #include <linux/types.h>
> -#include <linux/phy/phy.h>
>  #include <linux/input/matrix_keypad.h>
>  
>  /*
> @@ -634,7 +633,6 @@ enum twl4030_usb_mode {
>  struct twl4030_usb_data {
>  	enum twl4030_usb_mode	usb_mode;
>  	unsigned long		features;
> -	struct phy_init_data	*init_data;
>  
>  	int		(*phy_init)(struct device *dev);
>  	int		(*phy_exit)(struct device *dev);
> 
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/