ALSA: hda - Work around races of power up/down with runtime PM

[firefly-linux-kernel-4.4.55.git] / sound / pci / hda / patch_ca0132.c

diff --git a/sound/pci/hda/patch_ca0132.c b/sound/pci/hda/patch_ca0132.c
index e0383eea988024b77116b96e07d7528fb3bd60e7..4a4e7b282e4f87c9720c82089ac61f5c018258fb 100644 (file)
--- a/sound/pci/hda/patch_ca0132.c
+++ b/sound/pci/hda/patch_ca0132.c
@@ -719,7 +719,6 @@ struct ca0132_spec {
        unsigned int num_inputs;
        hda_nid_t shared_mic_nid;
        hda_nid_t shared_out_nid;
-       struct hda_pcm pcm_rec[5]; /* PCM information */
 
        /* chip access */
        struct mutex chipio_mutex; /* chip access mutex */
@@ -3132,7 +3131,7 @@ static int ca0132_select_out(struct hda_codec *codec)
 
        codec_dbg(codec, "ca0132_select_out\n");
 
-       snd_hda_power_up(codec);
+       snd_hda_power_up_pm(codec);
 
        auto_jack = spec->vnode_lswitch[VNID_HP_ASEL - VNODE_START_NID];
 
@@ -3216,7 +3215,7 @@ static int ca0132_select_out(struct hda_codec *codec)
        }
 
 exit:
-       snd_hda_power_down(codec);
+       snd_hda_power_down_pm(codec);
 
        return err < 0 ? err : 0;
 }
@@ -3294,7 +3293,7 @@ static int ca0132_select_mic(struct hda_codec *codec)
 
        codec_dbg(codec, "ca0132_select_mic\n");
 
-       snd_hda_power_up(codec);
+       snd_hda_power_up_pm(codec);
 
        auto_jack = spec->vnode_lswitch[VNID_AMIC1_ASEL - VNODE_START_NID];
 
@@ -3327,7 +3326,7 @@ static int ca0132_select_mic(struct hda_codec *codec)
                ca0132_effects_set(codec, VOICE_FOCUS, 0);
        }
 
-       snd_hda_power_down(codec);
+       snd_hda_power_down_pm(codec);
 
        return 0;
 }
@@ -4036,12 +4035,11 @@ static struct hda_pcm_stream ca0132_pcm_digital_capture = {
 static int ca0132_build_pcms(struct hda_codec *codec)
 {
        struct ca0132_spec *spec = codec->spec;
-       struct hda_pcm *info = spec->pcm_rec;
-
-       codec->pcm_info = info;
-       codec->num_pcms = 0;
+       struct hda_pcm *info;
 
-       info->name = "CA0132 Analog";
+       info = snd_hda_codec_pcm_new(codec, "CA0132 Analog");
+       if (!info)
+               return -ENOMEM;
        info->stream[SNDRV_PCM_STREAM_PLAYBACK] = ca0132_pcm_analog_playback;
        info->stream[SNDRV_PCM_STREAM_PLAYBACK].nid = spec->dacs[0];
        info->stream[SNDRV_PCM_STREAM_PLAYBACK].channels_max =
@@ -4049,27 +4047,27 @@ static int ca0132_build_pcms(struct hda_codec *codec)
        info->stream[SNDRV_PCM_STREAM_CAPTURE] = ca0132_pcm_analog_capture;
        info->stream[SNDRV_PCM_STREAM_CAPTURE].substreams = 1;
        info->stream[SNDRV_PCM_STREAM_CAPTURE].nid = spec->adcs[0];
-       codec->num_pcms++;
 
-       info++;
-       info->name = "CA0132 Analog Mic-In2";
+       info = snd_hda_codec_pcm_new(codec, "CA0132 Analog Mic-In2");
+       if (!info)
+               return -ENOMEM;
        info->stream[SNDRV_PCM_STREAM_CAPTURE] = ca0132_pcm_analog_capture;
        info->stream[SNDRV_PCM_STREAM_CAPTURE].substreams = 1;
        info->stream[SNDRV_PCM_STREAM_CAPTURE].nid = spec->adcs[1];
-       codec->num_pcms++;
 
-       info++;
-       info->name = "CA0132 What U Hear";
+       info = snd_hda_codec_pcm_new(codec, "CA0132 What U Hear");
+       if (!info)
+               return -ENOMEM;
        info->stream[SNDRV_PCM_STREAM_CAPTURE] = ca0132_pcm_analog_capture;
        info->stream[SNDRV_PCM_STREAM_CAPTURE].substreams = 1;
        info->stream[SNDRV_PCM_STREAM_CAPTURE].nid = spec->adcs[2];
-       codec->num_pcms++;
 
        if (!spec->dig_out && !spec->dig_in)
                return 0;
 
-       info++;
-       info->name = "CA0132 Digital";
+       info = snd_hda_codec_pcm_new(codec, "CA0132 Digital");
+       if (!info)
+               return -ENOMEM;
        info->pcm_type = HDA_PCM_TYPE_SPDIF;
        if (spec->dig_out) {
                info->stream[SNDRV_PCM_STREAM_PLAYBACK] =
@@ -4081,7 +4079,6 @@ static int ca0132_build_pcms(struct hda_codec *codec)
                        ca0132_pcm_digital_capture;
                info->stream[SNDRV_PCM_STREAM_CAPTURE].nid = spec->dig_in;
        }
-       codec->num_pcms++;
 
        return 0;
 }
@@ -4246,13 +4243,9 @@ static void ca0132_refresh_widget_caps(struct hda_codec *codec)
 {
        struct ca0132_spec *spec = codec->spec;
        int i;
-       hda_nid_t nid;
 
        codec_dbg(codec, "ca0132_refresh_widget_caps.\n");
-       nid = codec->start_nid;
-       for (i = 0; i < codec->num_nodes; i++, nid++)
-               codec->wcaps[i] = snd_hda_param_read(codec, nid,
-                                                    AC_PAR_AUDIO_WIDGET_CAP);
+       snd_hda_codec_update_widgets(codec);
 
        for (i = 0; i < spec->multiout.num_dacs; i++)
                refresh_amp_caps(codec, spec->dacs[i], HDA_OUTPUT);
@@ -4352,7 +4345,7 @@ static bool ca0132_download_dsp_images(struct hda_codec *codec)
        const struct dsp_image_seg *dsp_os_image;
        const struct firmware *fw_entry;
 
-       if (request_firmware(&fw_entry, EFX_FILE, codec->bus->card->dev) != 0)
+       if (request_firmware(&fw_entry, EFX_FILE, codec->card->dev) != 0)
                return false;
 
        dsp_os_image = (struct dsp_image_seg *)(fw_entry->data);
@@ -4413,8 +4406,7 @@ static void hp_callback(struct hda_codec *codec, struct hda_jack_callback *cb)
         * state machine run.
         */
        cancel_delayed_work_sync(&spec->unsol_hp_work);
-       queue_delayed_work(codec->bus->workq, &spec->unsol_hp_work,
-                          msecs_to_jiffies(500));
+       schedule_delayed_work(&spec->unsol_hp_work, msecs_to_jiffies(500));
        cb->tbl->block_report = 1;
 }
 
@@ -4554,7 +4546,7 @@ static int ca0132_init(struct hda_codec *codec)
                spec->dsp_state = DSP_DOWNLOAD_INIT;
        spec->curr_chip_addx = INVALID_CHIP_ADDRESS;
 
-       snd_hda_power_up(codec);
+       snd_hda_power_up_pm(codec);
 
        ca0132_init_unsol(codec);
 
@@ -4585,7 +4577,7 @@ static int ca0132_init(struct hda_codec *codec)
 
        snd_hda_jack_report_sync(codec);
 
-       snd_hda_power_down(codec);
+       snd_hda_power_down_pm(codec);
 
        return 0;
 }
@@ -4702,20 +4694,8 @@ MODULE_ALIAS("snd-hda-codec-id:11020011");
 MODULE_LICENSE("GPL");
 MODULE_DESCRIPTION("Creative Sound Core3D codec");
 
-static struct hda_codec_preset_list ca0132_list = {
+static struct hda_codec_driver ca0132_driver = {
        .preset = snd_hda_preset_ca0132,
-       .owner = THIS_MODULE,
 };
 
-static int __init patch_ca0132_init(void)
-{
-       return snd_hda_add_codec_preset(&ca0132_list);
-}
-
-static void __exit patch_ca0132_exit(void)
-{
-       snd_hda_delete_codec_preset(&ca0132_list);
-}
-
-module_init(patch_ca0132_init)
-module_exit(patch_ca0132_exit)
+module_hda_codec_driver(ca0132_driver);