Changeset 669

Timestamp:

Jan 30, 2021, 7:33:44 AM (5 years ago)

Author:

Paul Smedley

Message:

Code cleanups

Location:

GPL/branches/uniaud32-next/alsa-kernel/pci/hda

Files:

• hda_bind.c (modified) (6 diffs)
• hda_codec.c (modified) (6 diffs)

GPL/branches/uniaud32-next/alsa-kernel/pci/hda/hda_bind.c

@@ -16 +16 @@
 #include "hda_local.h"
 
-// 2020-11-17 SHL
-#include <../../../lib32/internal.h>
 #pragma disable_message (201)
 
@@ -40 +38 @@
                 }
         }
+
         return 0;
 }
@@ -102 +101 @@
         if (err < 0)
                 goto error;
-
         err = snd_hdac_regmap_init(&codec->core);
         if (err < 0)
@@ -132 +130 @@
                 snd_hda_codec_register(codec);
         }
+
         codec->core.lazy_cache = true;
-
         return 0;
 
@@ -308 +306 @@
         else
                 codec->probe_id = 0;
+
         err = snd_hdac_device_register(&codec->core);
         if (err < 0)
@@ -321 +320 @@
                 }
         }
+
         return 0;
 

GPL/branches/uniaud32-next/alsa-kernel/pci/hda/hda_codec.c

@@ -7 +7 @@
 
 #include <linux/init.h>
-#ifdef TARGET_OS2
-#include <linux/time.h>
-#include <linux/mm.h>
-#endif
 #include <linux/delay.h>
 #include <linux/slab.h>
@@ -629 +625 @@
 EXPORT_SYMBOL_GPL(snd_hda_shutup_pins);
 
-// 2020-11-17 SHL
-#include <../../../lib32/internal.h>
-
-
 #ifdef CONFIG_PM
 /* Restore the pin controls cleared previously via snd_hda_shutup_pins() */
@@ -752 +744 @@
         pcm->name = kvasprintf(GFP_KERNEL, fmt, args);
         va_end(args);
-
         if (!pcm->name) {
                 kfree(pcm);
@@ -759 +750 @@
 
         list_add_tail(&pcm->list, &codec->pcm_list_head);
-
         return pcm;
 }
@@ -2318 +2308 @@
 {
         const hda_nid_t *d;
+
         snd_hdac_regmap_update(&codec->core, nid, AC_VERB_SET_DIGI_CONVERT_1,
                                mask, val);
@@ -3099 +3090 @@
 {
         int err = 0;
-
         hda_exec_init_verbs(codec);
         /* continue to initialize... */