extcon: Remove the optional name of extcon device

chanwoochoi · chanwoochoi · commit d71aadda19f8 · 2015-05-19T16:39:06.000+09:00
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] -&gt; /sys/class/extcon/extcon[number]

Signed-off-by: Chanwoo Choi &lt;cw00.choi@samsung.com&gt;
Acked-by: Krzysztof Kozlowski &lt;k.kozlowski@samsung.com&gt;
Cc: MyungJoo Ham &lt;myungjoo.ham@samsung.com&gt;
Cc: Charles Keepax &lt;ckeepax@opensource.wolfsonmicro.com&gt;
Cc: Graeme Gregory &lt;gg@slimlogic.co.uk&gt;
Cc: Kishon Vijay Abraham I &lt;kishon@ti.com&gt;
Cc: Krzysztof Kozlowski &lt;k.kozlowski@samsung.com&gt;
Cc: Jaewon Kim &lt;jaewon02.kim@samsung.com&gt;
diff --git a/drivers/extcon/extcon-adc-jack.c b/drivers/extcon/extcon-adc-jack.c
@@ -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) {
diff --git a/drivers/extcon/extcon-gpio.c b/drivers/extcon/extcon-gpio.c
@@ -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;
diff --git a/drivers/extcon/extcon-max14577.c b/drivers/extcon/extcon-max14577.c
@@ -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");
diff --git a/drivers/extcon/extcon-max77693.c b/drivers/extcon/extcon-max77693.c
@@ -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) {
diff --git a/drivers/extcon/extcon-max8997.c b/drivers/extcon/extcon-max8997.c
@@ -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) {
diff --git a/drivers/extcon/extcon-palmas.c b/drivers/extcon/extcon-palmas.c
@@ -193,7 +193,6 @@ static int palmas_usb_probe(struct platform_device *pdev)
 		dev_err(&pdev->dev, "failed to allocate extcon device\n");
 		return -ENOMEM;
 	}
-	palmas_usb->edev->name = kstrdup(node->name, GFP_KERNEL);
 	palmas_usb->edev->mutually_exclusive = mutually_exclusive;
 
 	status = devm_extcon_dev_register(&pdev->dev, palmas_usb->edev);
diff --git a/drivers/extcon/extcon-rt8973a.c b/drivers/extcon/extcon-rt8973a.c
@@ -631,7 +631,6 @@ static int rt8973a_muic_i2c_probe(struct i2c_client *i2c,
 		dev_err(info->dev, "failed to allocate memory for extcon\n");
 		return -ENOMEM;
 	}
-	info->edev->name = np->name;
 
 	/* Register extcon device */
 	ret = devm_extcon_dev_register(info->dev, info->edev);
diff --git a/drivers/extcon/extcon-sm5502.c b/drivers/extcon/extcon-sm5502.c
@@ -623,7 +623,6 @@ static int sm5022_muic_i2c_probe(struct i2c_client *i2c,
 		dev_err(info->dev, "failed to allocate memory for extcon\n");
 		return -ENOMEM;
 	}
-	info->edev->name = np->name;
 
 	/* Register extcon device */
 	ret = devm_extcon_dev_register(info->dev, info->edev);

Original file line number	Diff line number	Diff line change
`@@ -110,7 +110,6 @@ static int adc_jack_probe(struct platform_device *pdev)`
`110`	`110`	`dev_err(&pdev->dev, "failed to allocate extcon device\n");`
`111`	`111`	`return -ENOMEM;`
`112`	`112`	`}`
`113`		`- data->edev->name = pdata->name;`
`114`	`113`
`115`	`114`	`if (!pdata->adc_conditions \|\|`
`116`	`115`	`!pdata->adc_conditions[0].state) {`
Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,6 @@ static int gpio_extcon_probe(struct platform_device *pdev)`
`104`	`104`	`dev_err(&pdev->dev, "failed to allocate extcon device\n");`
`105`	`105`	`return -ENOMEM;`
`106`	`106`	`}`
`107`		`- extcon_data->edev->name = pdata->name;`
`108`	`107`
`109`	`108`	`extcon_data->gpio = pdata->gpio;`
`110`	`109`	`extcon_data->gpio_active_low = pdata->gpio_active_low;`
Original file line number	Diff line number	Diff line change
`@@ -729,8 +729,6 @@ static int max14577_muic_probe(struct platform_device *pdev)`
`729`	`729`	`return -ENOMEM;`
`730`	`730`	`}`
`731`	`731`
`732`		`- info->edev->name = dev_name(&pdev->dev);`
`733`		`-`
`734`	`732`	`ret = devm_extcon_dev_register(&pdev->dev, info->edev);`
`735`	`733`	`if (ret) {`
`736`	`734`	`dev_err(&pdev->dev, "failed to register extcon device\n");`
Original file line number	Diff line number	Diff line change
`@@ -1158,7 +1158,6 @@ static int max77693_muic_probe(struct platform_device *pdev)`
`1158`	`1158`	`dev_err(&pdev->dev, "failed to allocate memory for extcon\n");`
`1159`	`1159`	`return -ENOMEM;`
`1160`	`1160`	`}`
`1161`		`- info->edev->name = DEV_NAME;`
`1162`	`1161`
`1163`	`1162`	`ret = devm_extcon_dev_register(&pdev->dev, info->edev);`
`1164`	`1163`	`if (ret) {`
Original file line number	Diff line number	Diff line change
`@@ -696,7 +696,6 @@ static int max8997_muic_probe(struct platform_device *pdev)`
`696`	`696`	`ret = -ENOMEM;`
`697`	`697`	`goto err_irq;`
`698`	`698`	`}`
`699`		`- info->edev->name = DEV_NAME;`
`700`	`699`
`701`	`700`	`ret = devm_extcon_dev_register(&pdev->dev, info->edev);`
`702`	`701`	`if (ret) {`
Original file line number	Diff line number	Diff line change
`@@ -193,7 +193,6 @@ static int palmas_usb_probe(struct platform_device *pdev)`
`193`	`193`	`dev_err(&pdev->dev, "failed to allocate extcon device\n");`
`194`	`194`	`return -ENOMEM;`
`195`	`195`	`}`
`196`		`- palmas_usb->edev->name = kstrdup(node->name, GFP_KERNEL);`
`197`	`196`	`palmas_usb->edev->mutually_exclusive = mutually_exclusive;`
`198`	`197`
`199`	`198`	`status = devm_extcon_dev_register(&pdev->dev, palmas_usb->edev);`
Original file line number	Diff line number	Diff line change
`@@ -631,7 +631,6 @@ static int rt8973a_muic_i2c_probe(struct i2c_client *i2c,`
`631`	`631`	`dev_err(info->dev, "failed to allocate memory for extcon\n");`
`632`	`632`	`return -ENOMEM;`
`633`	`633`	`}`
`634`		`- info->edev->name = np->name;`
`635`	`634`
`636`	`635`	`/* Register extcon device */`
`637`	`636`	`ret = devm_extcon_dev_register(info->dev, info->edev);`
Original file line number	Diff line number	Diff line change
`@@ -623,7 +623,6 @@ static int sm5022_muic_i2c_probe(struct i2c_client *i2c,`
`623`	`623`	`dev_err(info->dev, "failed to allocate memory for extcon\n");`
`624`	`624`	`return -ENOMEM;`
`625`	`625`	`}`
`626`		`- info->edev->name = np->name;`
`627`	`626`
`628`	`627`	`/* Register extcon device */`
`629`	`628`	`ret = devm_extcon_dev_register(info->dev, info->edev);`