Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d71aadda authored by Chanwoo Choi's avatar Chanwoo Choi
Browse files

extcon: Remove the optional name of extcon device 



This patch removes the optional name of extcon device. Instead,
extcon_dev_register() set the device name as 'extcon[number]' naming pattern.
- /sys/class/extcon/[hardcoded device name] -> /sys/class/extcon/extcon[number]

Signed-off-by: default avatarChanwoo Choi <cw00.choi@samsung.com>
Acked-by: default avatarKrzysztof Kozlowski <k.kozlowski@samsung.com>
Cc: MyungJoo Ham <myungjoo.ham@samsung.com>
Cc: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
Cc: Graeme Gregory <gg@slimlogic.co.uk>
Cc: Kishon Vijay Abraham I <kishon@ti.com>
Cc: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Cc: Jaewon Kim <jaewon02.kim@samsung.com>
parent 638f958b

drivers/extcon/extcon-adc-jack.c

+0 −1
Original line number Diff line number Diff line
@@ -110,7 +110,6 @@ static int adc_jack_probe(struct platform_device *pdev) 
		dev_err(&pdev->dev, "failed to allocate extcon device\n");

		return -ENOMEM;

	}

	data->edev->name = pdata->name;



	if (!pdata->adc_conditions ||

			!pdata->adc_conditions[0].state) {

drivers/extcon/extcon-gpio.c

+0 −1
Original line number Diff line number Diff line
@@ -104,7 +104,6 @@ static int gpio_extcon_probe(struct platform_device *pdev) 
		dev_err(&pdev->dev, "failed to allocate extcon device\n");

		return -ENOMEM;

	}

	extcon_data->edev->name = pdata->name;



	extcon_data->gpio = pdata->gpio;

	extcon_data->gpio_active_low = pdata->gpio_active_low;

drivers/extcon/extcon-max14577.c

+0 −2
Original line number Diff line number Diff line
@@ -729,8 +729,6 @@ static int max14577_muic_probe(struct platform_device *pdev) 
		return -ENOMEM;

	}



	info->edev->name = dev_name(&pdev->dev);



	ret = devm_extcon_dev_register(&pdev->dev, info->edev);

	if (ret) {

		dev_err(&pdev->dev, "failed to register extcon device\n");

drivers/extcon/extcon-max77693.c

+0 −1
Original line number Diff line number Diff line
@@ -1158,7 +1158,6 @@ static int max77693_muic_probe(struct platform_device *pdev) 
		dev_err(&pdev->dev, "failed to allocate memory for extcon\n");

		return -ENOMEM;

	}

	info->edev->name = DEV_NAME;



	ret = devm_extcon_dev_register(&pdev->dev, info->edev);

	if (ret) {

drivers/extcon/extcon-max8997.c

+0 −1
Original line number Diff line number Diff line
@@ -696,7 +696,6 @@ static int max8997_muic_probe(struct platform_device *pdev) 
		ret = -ENOMEM;

		goto err_irq;

	}

	info->edev->name = DEV_NAME;



	ret = devm_extcon_dev_register(&pdev->dev, info->edev);

	if (ret) {