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

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

extcon: adc-jack: Remove the unneeded num_cables field 



This patch removes the 'num_cables' filed from 'struct adc_jack_pdata'
because 'struct extcon_dev' contains the 'max_supported' field which
means the number of supported cable of extcon device.

Signed-off-by: default avatarChanwoo Choi <cw00.choi@samsung.com>
parent 942e0239

drivers/extcon/extcon-adc-jack.c

+0 −12
Original line number Original line Diff line number Diff line
@@ -29,7 +29,6 @@ 
 * struct adc_jack_data - internal data for adc_jack device driver

 * struct adc_jack_data - internal data for adc_jack device driver

 * @edev:		extcon device.

 * @edev:		extcon device.

 * @cable_names:	list of supported cables.

 * @cable_names:	list of supported cables.

 * @num_cables:		size of cable_names.

 * @adc_conditions:	list of adc value conditions.

 * @adc_conditions:	list of adc value conditions.

 * @num_conditions:	size of adc_conditions.

 * @num_conditions:	size of adc_conditions.

 * @irq:		irq number of attach/detach event (0 if not exist).

 * @irq:		irq number of attach/detach event (0 if not exist).
@@ -42,7 +41,6 @@ struct adc_jack_data { 
	struct extcon_dev *edev;

	struct extcon_dev *edev;





	const char **cable_names;

	const char **cable_names;

	int num_cables;

	struct adc_jack_cond *adc_conditions;

	struct adc_jack_cond *adc_conditions;

	int num_conditions;

	int num_conditions;
@@ -114,16 +112,6 @@ static int adc_jack_probe(struct platform_device *pdev) 
	}

	}

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

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





	/* Check the length of array and set num_cables */

	for (i = 0; data->edev->supported_cable[i]; i++)

		;

	if (i == 0 || i > SUPPORTED_CABLE_MAX) {

		dev_err(&pdev->dev, "error: pdata->cable_names size = %d\n",

				i - 1);

		return -EINVAL;

	}

	data->num_cables = i;



	if (!pdata->adc_conditions ||

	if (!pdata->adc_conditions ||

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

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

		dev_err(&pdev->dev, "error: adc_conditions not defined.\n");

		dev_err(&pdev->dev, "error: adc_conditions not defined.\n");