]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
extcon: adc-jack: Remove the unneeded num_cables field
authorChanwoo Choi <cw00.choi@samsung.com>
Sat, 25 Apr 2015 09:44:47 +0000 (18:44 +0900)
committerChanwoo Choi <cw00.choi@samsung.com>
Tue, 19 May 2015 07:39:06 +0000 (16:39 +0900)
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>
drivers/extcon/extcon-adc-jack.c

index 2bb82e55065aa3e7d615b6b1c2e46286df0d9d4e..768eaed66380031e79ea7b15037081c410bbfacf 100644 (file)
@@ -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");