Skip to content

Commit

Permalink
extcon: adc-jack: Remove the unneeded num_cables field
Browse files Browse the repository at this point in the history
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: Chanwoo Choi <cw00.choi@samsung.com>
  • Loading branch information
Chanwoo Choi committed May 19, 2015
1 parent 942e023 commit c571bbb
Showing 1 changed file with 0 additions and 12 deletions.
12 changes: 0 additions & 12 deletions drivers/extcon/extcon-adc-jack.c
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
* struct adc_jack_data - internal data for adc_jack device driver
* @edev: extcon device.
* @cable_names: list of supported cables.
* @num_cables: size of cable_names.
* @adc_conditions: list of adc value conditions.
* @num_conditions: size of adc_conditions.
* @irq: irq number of attach/detach event (0 if not exist).
Expand All @@ -42,7 +41,6 @@ struct adc_jack_data {
struct extcon_dev *edev;

const char **cable_names;
int num_cables;
struct adc_jack_cond *adc_conditions;
int num_conditions;

Expand Down Expand Up @@ -114,16 +112,6 @@ static int adc_jack_probe(struct platform_device *pdev)
}
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 ||
!pdata->adc_conditions[0].state) {
dev_err(&pdev->dev, "error: adc_conditions not defined.\n");
Expand Down

0 comments on commit c571bbb

Please sign in to comment.