Re: [PATCH 2/4] extcon: axp288: Remove unused platform data

[Chanwoo Choi]

+ MFD Maintainer (Lee Jones <lee.jones@xxxxxxxxxx>)

Hi Hans,

You better to use the scripts/get_maintainer.pl for the mailing list.
I added the MFD maintainer.

This patch looks good to me.
Reviewed-by: Chanwoo Choi <cw00.choi@xxxxxxxxxxx>


Best Regards,
Chanwoo Choi

On 2017ë 12ì 22ì 21:36, Hans de Goede wrote:
> This is not used / set anywhere in the tree.
> 
> Signed-off-by: Hans de Goede <hdegoede@xxxxxxxxxx>
> ---
>  drivers/extcon/extcon-axp288.c | 35 +----------------------------------
>  include/linux/mfd/axp20x.h     |  5 -----
>  2 files changed, 1 insertion(+), 39 deletions(-)
> 
> diff --git a/drivers/extcon/extcon-axp288.c b/drivers/extcon/extcon-axp288.c
> index ba185e9ebb82..386afb7d1160 100644
> --- a/drivers/extcon/extcon-axp288.c
> +++ b/drivers/extcon/extcon-axp288.c
> @@ -24,8 +24,6 @@
>  #include <linux/notifier.h>
>  #include <linux/extcon-provider.h>
>  #include <linux/regmap.h>
> -#include <linux/gpio.h>
> -#include <linux/gpio/consumer.h>
>  #include <linux/mfd/axp20x.h>
>  
>  /* Power source status register */
> @@ -79,11 +77,6 @@ enum axp288_extcon_reg {
>  	AXP288_BC_DET_STAT_REG		= 0x2f,
>  };
>  
> -enum axp288_mux_select {
> -	EXTCON_GPIO_MUX_SEL_PMIC = 0,
> -	EXTCON_GPIO_MUX_SEL_SOC,
> -};
> -
>  enum axp288_extcon_irq {
>  	VBUS_FALLING_IRQ = 0,
>  	VBUS_RISING_IRQ,
> @@ -104,7 +97,6 @@ struct axp288_extcon_info {
>  	struct device *dev;
>  	struct regmap *regmap;
>  	struct regmap_irq_chip_data *regmap_irqc;
> -	struct gpio_desc *gpio_mux_cntl;
>  	int irq[EXTCON_IRQ_END];
>  	struct extcon_dev *edev;
>  	unsigned int previous_cable;
> @@ -196,15 +188,6 @@ static int axp288_handle_chrg_det_event(struct axp288_extcon_info *info)
>  	}
>  
>  no_vbus:
> -	/*
> -	 * If VBUS is absent Connect D+/D- lines to PMIC for BC
> -	 * detection. Else connect them to SOC for USB communication.
> -	 */
> -	if (info->gpio_mux_cntl)
> -		gpiod_set_value(info->gpio_mux_cntl,
> -			vbus_attach ? EXTCON_GPIO_MUX_SEL_SOC
> -					: EXTCON_GPIO_MUX_SEL_PMIC);
> -
>  	extcon_set_state_sync(info->edev, info->previous_cable, false);
>  	if (info->previous_cable == EXTCON_CHG_USB_SDP)
>  		extcon_set_state_sync(info->edev, EXTCON_USB, false);
> @@ -252,8 +235,7 @@ static int axp288_extcon_probe(struct platform_device *pdev)
>  {
>  	struct axp288_extcon_info *info;
>  	struct axp20x_dev *axp20x = dev_get_drvdata(pdev->dev.parent);
> -	struct axp288_extcon_pdata *pdata = pdev->dev.platform_data;
> -	int ret, i, pirq, gpio;
> +	int ret, i, pirq;
>  
>  	info = devm_kzalloc(&pdev->dev, sizeof(*info), GFP_KERNEL);
>  	if (!info)
> @@ -263,8 +245,6 @@ static int axp288_extcon_probe(struct platform_device *pdev)
>  	info->regmap = axp20x->regmap;
>  	info->regmap_irqc = axp20x->regmap_irqc;
>  	info->previous_cable = EXTCON_NONE;
> -	if (pdata)
> -		info->gpio_mux_cntl = pdata->gpio_mux_cntl;
>  
>  	platform_set_drvdata(pdev, info);
>  
> @@ -285,19 +265,6 @@ static int axp288_extcon_probe(struct platform_device *pdev)
>  		return ret;
>  	}
>  
> -	/* Set up gpio control for USB Mux */
> -	if (info->gpio_mux_cntl) {
> -		gpio = desc_to_gpio(info->gpio_mux_cntl);
> -		ret = devm_gpio_request(&pdev->dev, gpio, "USB_MUX");
> -		if (ret < 0) {
> -			dev_err(&pdev->dev,
> -				"failed to request the gpio=%d\n", gpio);
> -			return ret;
> -		}
> -		gpiod_direction_output(info->gpio_mux_cntl,
> -						EXTCON_GPIO_MUX_SEL_PMIC);
> -	}
> -
>  	for (i = 0; i < EXTCON_IRQ_END; i++) {
>  		pirq = platform_get_irq(pdev, i);
>  		info->irq[i] = regmap_irq_get_virq(info->regmap_irqc, pirq);
> diff --git a/include/linux/mfd/axp20x.h b/include/linux/mfd/axp20x.h
> index 78dc85365c4f..080798f17ece 100644
> --- a/include/linux/mfd/axp20x.h
> +++ b/include/linux/mfd/axp20x.h
> @@ -645,11 +645,6 @@ struct axp20x_dev {
>  	const struct regmap_irq_chip	*regmap_irq_chip;
>  };
>  
> -struct axp288_extcon_pdata {
> -	/* GPIO pin control to switch D+/D- lines b/w PMIC and SOC */
> -	struct gpio_desc *gpio_mux_cntl;
> -};
> -
>  /* generic helper function for reading 9-16 bit wide regs */
>  static inline int axp20x_read_variable_width(struct regmap *regmap,
>  	unsigned int reg, unsigned int width)
>