diff options
author | Chanwoo Choi <cw00.choi@samsung.com> | 2015-04-25 18:44:47 +0900 |
---|---|---|
committer | Chanwoo Choi <cw00.choi@samsung.com> | 2015-05-19 16:39:06 +0900 |
commit | c571bbb4b699cfd3af5b4c1027b04eb4290e6726 (patch) | |
tree | 3f207a52b04c66dab57adf335adb4aaec50f4e5e /drivers/extcon | |
parent | 942e0239d51185d6532f3ac846e5ab06db0a86cf (diff) | |
download | linux-stable-c571bbb4b699cfd3af5b4c1027b04eb4290e6726.tar.gz linux-stable-c571bbb4b699cfd3af5b4c1027b04eb4290e6726.tar.bz2 linux-stable-c571bbb4b699cfd3af5b4c1027b04eb4290e6726.zip |
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: Chanwoo Choi <cw00.choi@samsung.com>
Diffstat (limited to 'drivers/extcon')
-rw-r--r-- | drivers/extcon/extcon-adc-jack.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/drivers/extcon/extcon-adc-jack.c b/drivers/extcon/extcon-adc-jack.c index 2bb82e55065a..768eaed66380 100644 --- a/drivers/extcon/extcon-adc-jack.c +++ b/drivers/extcon/extcon-adc-jack.c @@ -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). @@ -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; @@ -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"); |