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

Commit 42d7d753 authored by Chanwoo Choi's avatar Chanwoo Choi
Browse files

extcon: Simplify extcon_dev_register() prototype by removing unnecessary parameter 



This patch remove extcon_dev_register()'s second parameter which means
the pointer of parent device to simplify prototype of this function.
So, if extcon device has the parent device, it should set the pointer of
parent device to edev.dev.parent in extcon device driver instead of in
extcon_dev_register().

Cc: Graeme Gregory <gg@slimlogic.co.uk>
Cc: Kishon Vijay Abraham I <kishon@ti.com>
Cc: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
Cc: Mark Brown <broonie@kernel.org>
Signed-off-by: default avatarChanwoo Choi <cw00.choi@samsung.com>
Signed-off-by: default avatarMyungjoo Ham <myungjoo.ham@samsung.com>
parent dae61651

Documentation/extcon/porting-android-switch-class

+4 −2
Original line number Diff line number Diff line
@@ -25,8 +25,10 @@ MyungJoo Ham <myungjoo.ham@samsung.com> 
    @print_state: no change but type change (switch_dev->extcon_dev)



- switch_dev_register(sdev, dev)

	=> extcon_dev_register(edev, dev)

	: no change but type change (sdev->edev)

	=> extcon_dev_register(edev)

	: type change (sdev->edev)

	: remove second param('dev'). if edev has parent device, should store

	  'dev' to 'edev.dev.parent' before registering extcon device

- switch_dev_unregister(sdev)

	=> extcon_dev_unregister(edev)

	: no change but type change (sdev->edev)

drivers/extcon/extcon-adc-jack.c

+2 −1
Original line number Diff line number Diff line
@@ -110,6 +110,7 @@ static int adc_jack_probe(struct platform_device *pdev) 
		goto out;

	}



	data->edev.dev.parent = &pdev->dev;

	data->edev.supported_cable = pdata->cable_names;



	/* Check the length of array and set num_cables */
@@ -148,7 +149,7 @@ static int adc_jack_probe(struct platform_device *pdev) 


	platform_set_drvdata(pdev, data);



	err = extcon_dev_register(&data->edev, &pdev->dev);

	err = extcon_dev_register(&data->edev);

	if (err)

		goto out;

drivers/extcon/extcon-arizona.c

+2 −1
Original line number Diff line number Diff line
@@ -1130,9 +1130,10 @@ static int arizona_extcon_probe(struct platform_device *pdev) 
	}



	info->edev.name = "Headset Jack";

	info->edev.dev.parent = arizona->dev;

	info->edev.supported_cable = arizona_cable;



	ret = extcon_dev_register(&info->edev, arizona->dev);

	ret = extcon_dev_register(&info->edev);

	if (ret < 0) {

		dev_err(arizona->dev, "extcon_dev_register() failed: %d\n",

			ret);

drivers/extcon/extcon-class.c

+7 −4
Original line number Diff line number Diff line
@@ -566,14 +566,13 @@ static void dummy_sysfs_dev_release(struct device *dev) 
/**

 * extcon_dev_register() - Register a new extcon device

 * @edev	: the new extcon device (should be allocated before calling)

 * @dev		: the parent device for this extcon device.

 *

 * Among the members of edev struct, please set the "user initializing data"

 * in any case and set the "optional callbacks" if required. However, please

 * do not set the values of "internal data", which are initialized by

 * this function.

 */

int extcon_dev_register(struct extcon_dev *edev, struct device *dev)

int extcon_dev_register(struct extcon_dev *edev)

{

	int ret, index = 0;
@@ -597,11 +596,15 @@ int extcon_dev_register(struct extcon_dev *edev, struct device *dev) 
		return -EINVAL;

	}



	edev->dev.parent = dev;

	edev->dev.class = extcon_class;

	edev->dev.release = extcon_dev_release;



	edev->name = edev->name ? edev->name : dev_name(dev);

	edev->name = edev->name ? edev->name : dev_name(edev->dev.parent);

	if (IS_ERR_OR_NULL(edev->name)) {

		dev_err(&edev->dev,

			"extcon device name is null\n");

		return -EINVAL;

	}

	dev_set_name(&edev->dev, "%s", edev->name);



	if (edev->max_supported) {

drivers/extcon/extcon-gpio.c

+2 −1
Original line number Diff line number Diff line
@@ -98,6 +98,7 @@ static int gpio_extcon_probe(struct platform_device *pdev) 
		return -ENOMEM;



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

	extcon_data->edev.dev.parent = &pdev->dev;

	extcon_data->gpio = pdata->gpio;

	extcon_data->gpio_active_low = pdata->gpio_active_low;

	extcon_data->state_on = pdata->state_on;
@@ -112,7 +113,7 @@ static int gpio_extcon_probe(struct platform_device *pdev) 
				msecs_to_jiffies(pdata->debounce);

	}



	ret = extcon_dev_register(&extcon_data->edev, &pdev->dev);

	ret = extcon_dev_register(&extcon_data->edev);

	if (ret < 0)

		return ret;