Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild

[firefly-linux-kernel-4.4.55.git] / drivers / extcon / extcon-arizona.c

diff --git a/drivers/extcon/extcon-arizona.c b/drivers/extcon/extcon-arizona.c
index c20602f601ee22732635aa3fa04fe94e44ed6020..6c84e3d120435f9ad16d5afd3a030e98140b6f47 100644 (file)
--- a/drivers/extcon/extcon-arizona.c
+++ b/drivers/extcon/extcon-arizona.c
@@ -91,7 +91,7 @@ struct arizona_extcon_info {
 
        int hpdet_ip;
 
-       struct extcon_dev edev;
+       struct extcon_dev *edev;
 };
 
 static const struct arizona_micd_config micd_default_modes[] = {
@@ -222,27 +222,19 @@ static void arizona_extcon_pulse_micbias(struct arizona_extcon_info *info)
        struct snd_soc_dapm_context *dapm = arizona->dapm;
        int ret;
 
-       mutex_lock(&dapm->card->dapm_mutex);
-
        ret = snd_soc_dapm_force_enable_pin(dapm, widget);
        if (ret != 0)
                dev_warn(arizona->dev, "Failed to enable %s: %d\n",
                         widget, ret);
 
-       mutex_unlock(&dapm->card->dapm_mutex);
-
        snd_soc_dapm_sync(dapm);
 
        if (!arizona->pdata.micd_force_micbias) {
-               mutex_lock(&dapm->card->dapm_mutex);
-
                ret = snd_soc_dapm_disable_pin(arizona->dapm, widget);
                if (ret != 0)
                        dev_warn(arizona->dev, "Failed to disable %s: %d\n",
                                 widget, ret);
 
-               mutex_unlock(&dapm->card->dapm_mutex);
-
                snd_soc_dapm_sync(dapm);
        }
 }
@@ -304,16 +296,12 @@ static void arizona_stop_mic(struct arizona_extcon_info *info)
                                 ARIZONA_MICD_ENA, 0,
                                 &change);
 
-       mutex_lock(&dapm->card->dapm_mutex);
-
        ret = snd_soc_dapm_disable_pin(dapm, widget);
        if (ret != 0)
                dev_warn(arizona->dev,
                         "Failed to disable %s: %d\n",
                         widget, ret);
 
-       mutex_unlock(&dapm->card->dapm_mutex);
-
        snd_soc_dapm_sync(dapm);
 
        if (info->micd_reva) {
@@ -558,7 +546,7 @@ static irqreturn_t arizona_hpdet_irq(int irq, void *data)
        }
 
        /* If the cable was removed while measuring ignore the result */
-       ret = extcon_get_cable_state_(&info->edev, ARIZONA_CABLE_MECHANICAL);
+       ret = extcon_get_cable_state_(info->edev, ARIZONA_CABLE_MECHANICAL);
        if (ret < 0) {
                dev_err(arizona->dev, "Failed to check cable state: %d\n",
                        ret);
@@ -593,7 +581,7 @@ static irqreturn_t arizona_hpdet_irq(int irq, void *data)
        else
                report = ARIZONA_CABLE_HEADPHONE;
 
-       ret = extcon_set_cable_state_(&info->edev, report, true);
+       ret = extcon_set_cable_state_(info->edev, report, true);
        if (ret != 0)
                dev_err(arizona->dev, "Failed to report HP/line: %d\n",
                        ret);
@@ -676,7 +664,7 @@ err:
                           ARIZONA_ACCDET_MODE_MASK, ARIZONA_ACCDET_MODE_MIC);
 
        /* Just report headphone */
-       ret = extcon_update_state(&info->edev,
+       ret = extcon_update_state(info->edev,
                                  1 << ARIZONA_CABLE_HEADPHONE,
                                  1 << ARIZONA_CABLE_HEADPHONE);
        if (ret != 0)
@@ -735,7 +723,7 @@ err:
                           ARIZONA_ACCDET_MODE_MASK, ARIZONA_ACCDET_MODE_MIC);
 
        /* Just report headphone */
-       ret = extcon_update_state(&info->edev,
+       ret = extcon_update_state(info->edev,
                                  1 << ARIZONA_CABLE_HEADPHONE,
                                  1 << ARIZONA_CABLE_HEADPHONE);
        if (ret != 0)
@@ -776,7 +764,7 @@ static void arizona_micd_detect(struct work_struct *work)
        mutex_lock(&info->lock);
 
        /* If the cable was removed while measuring ignore the result */
-       ret = extcon_get_cable_state_(&info->edev, ARIZONA_CABLE_MECHANICAL);
+       ret = extcon_get_cable_state_(info->edev, ARIZONA_CABLE_MECHANICAL);
        if (ret < 0) {
                dev_err(arizona->dev, "Failed to check cable state: %d\n",
                                ret);
@@ -824,7 +812,7 @@ static void arizona_micd_detect(struct work_struct *work)
        if (info->detecting && (val & ARIZONA_MICD_LVL_8)) {
                arizona_identify_headphone(info);
 
-               ret = extcon_update_state(&info->edev,
+               ret = extcon_update_state(info->edev,
                                          1 << ARIZONA_CABLE_MICROPHONE,
                                          1 << ARIZONA_CABLE_MICROPHONE);
 
@@ -1011,7 +999,7 @@ static irqreturn_t arizona_jackdet(int irq, void *data)
 
        if (info->last_jackdet == present) {
                dev_dbg(arizona->dev, "Detected jack\n");
-               ret = extcon_set_cable_state_(&info->edev,
+               ret = extcon_set_cable_state_(info->edev,
                                              ARIZONA_CABLE_MECHANICAL, true);
 
                if (ret != 0)
@@ -1050,7 +1038,7 @@ static irqreturn_t arizona_jackdet(int irq, void *data)
                                         info->micd_ranges[i].key, 0);
                input_sync(info->input);
 
-               ret = extcon_update_state(&info->edev, 0xffffffff, 0);
+               ret = extcon_update_state(info->edev, 0xffffffff, 0);
                if (ret != 0)
                        dev_err(arizona->dev, "Removal report failed: %d\n",
                                ret);
@@ -1117,15 +1105,14 @@ static int arizona_extcon_probe(struct platform_device *pdev)
        info = devm_kzalloc(&pdev->dev, sizeof(*info), GFP_KERNEL);
        if (!info) {
                dev_err(&pdev->dev, "Failed to allocate memory\n");
-               ret = -ENOMEM;
-               goto err;
+               return -ENOMEM;
        }
 
        info->micvdd = devm_regulator_get(arizona->dev, "MICVDD");
        if (IS_ERR(info->micvdd)) {
                ret = PTR_ERR(info->micvdd);
                dev_err(arizona->dev, "Failed to get MICVDD: %d\n", ret);
-               goto err;
+               return ret;
        }
 
        mutex_init(&info->lock);
@@ -1163,15 +1150,19 @@ static int arizona_extcon_probe(struct platform_device *pdev)
                break;
        }
 
-       info->edev.name = "Headset Jack";
-       info->edev.dev.parent = arizona->dev;
-       info->edev.supported_cable = arizona_cable;
+       info->edev = devm_extcon_dev_allocate(&pdev->dev, arizona_cable);
+       if (IS_ERR(info->edev)) {
+               dev_err(&pdev->dev, "failed to allocate extcon device\n");
+               return -ENOMEM;
+       }
+       info->edev->name = "Headset Jack";
+       info->edev->dev.parent = arizona->dev;
 
-       ret = extcon_dev_register(&info->edev);
+       ret = devm_extcon_dev_register(&pdev->dev, info->edev);
        if (ret < 0) {
                dev_err(arizona->dev, "extcon_dev_register() failed: %d\n",
                        ret);
-               goto err;
+               return ret;
        }
 
        info->input = devm_input_allocate_device(&pdev->dev);
@@ -1422,8 +1413,6 @@ err_rise:
 err_input:
 err_register:
        pm_runtime_disable(&pdev->dev);
-       extcon_dev_unregister(&info->edev);
-err:
        return ret;
 }
 
@@ -1457,7 +1446,6 @@ static int arizona_extcon_remove(struct platform_device *pdev)
        regmap_update_bits(arizona->regmap, ARIZONA_JACK_DETECT_ANALOGUE,
                           ARIZONA_JD1_ENA, 0);
        arizona_clk32k_disable(arizona);
-       extcon_dev_unregister(&info->edev);
 
        return 0;
 }