Merge remote-tracking branch 'sound-current/for-linus'

[karo-tx-linux.git] / sound / pci / hda / patch_ca0132.c

diff --git a/sound/pci/hda/patch_ca0132.c b/sound/pci/hda/patch_ca0132.c
index 186792fe226e08d95d8bb67c959e0fbd7d86bd25..f8a12ca477f1ab775a101c8bb41876a11707477e 100644 (file)
--- a/sound/pci/hda/patch_ca0132.c
+++ b/sound/pci/hda/patch_ca0132.c
@@ -2673,13 +2673,13 @@ static bool dspload_wait_loaded(struct hda_codec *codec)
 
        do {
                if (dspload_is_loaded(codec)) {
-                       pr_info("ca0132 DOWNLOAD OK :-) DSP IS RUNNING.\n");
+                       codec_info(codec, "ca0132 DSP downloaded and running\n");
                        return true;
                }
                msleep(20);
        } while (time_before(jiffies, timeout));
 
-       pr_err("ca0132 DOWNLOAD FAILED!!! DSP IS NOT RUNNING.\n");
+       codec_err(codec, "ca0132 failed to download DSP\n");
        return false;
 }
 
@@ -4375,7 +4375,7 @@ static bool ca0132_download_dsp_images(struct hda_codec *codec)
 
        dsp_os_image = (struct dsp_image_seg *)(fw_entry->data);
        if (dspload_image(codec, dsp_os_image, 0, 0, true, 0)) {
-               pr_err("ca0132 dspload_image failed.\n");
+               codec_err(codec, "ca0132 DSP load image failed\n");
                goto exit_download;
        }
 
@@ -4778,18 +4778,17 @@ static int patch_ca0132(struct hda_codec *codec)
 /*
  * patch entries
  */
-static struct hda_codec_preset snd_hda_preset_ca0132[] = {
-       { .id = 0x11020011, .name = "CA0132",     .patch = patch_ca0132 },
+static struct hda_device_id snd_hda_id_ca0132[] = {
+       HDA_CODEC_ENTRY(0x11020011, "CA0132", patch_ca0132),
        {} /* terminator */
 };
-
-MODULE_ALIAS("snd-hda-codec-id:11020011");
+MODULE_DEVICE_TABLE(hdaudio, snd_hda_id_ca0132);
 
 MODULE_LICENSE("GPL");
 MODULE_DESCRIPTION("Creative Sound Core3D codec");
 
 static struct hda_codec_driver ca0132_driver = {
-       .preset = snd_hda_preset_ca0132,
+       .id = snd_hda_id_ca0132,
 };
 
 module_hda_codec_driver(ca0132_driver);