[ALSA] Misc clean up [Linux 2.6.13]

This Linux kernel change "[ALSA] Misc clean up" is included in the Linux 2.6.13 release. This change is authored by Takashi Iwai <tiwai [at] suse.de> on Thu Apr 14 13:37:13 2005 +0200. The commit for this change in Linux stable tree is 98f759a (patch).

[ALSA] Misc clean up

HDA Codec driver
Misc clean up: move the definitions of constants for pinctl to a single place.

Signed-off-by: Takashi Iwai <tiwai@suse.de>

There are 12 lines of Linux source code added/deleted in this change. Code changes to Linux kernel are as follows.

 sound/pci/hda/hda_codec.h | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/sound/pci/hda/hda_codec.h b/sound/pci/hda/hda_codec.h
index 042bcfc6..263f5b6 100644
--- a/sound/pci/hda/hda_codec.h
+++ b/sound/pci/hda/hda_codec.h
@@ -185,13 +185,6 @@ enum {
 #define AC_PINCAP_VREF_GRD     (1<<2)  /* ground */
 #define AC_PINCAP_VREF_80      (1<<4)  /* 80% */
 #define AC_PINCAP_VREF_100     (1<<5)  /* 100% */
-/* Vref setting (used in pin ctl) */
-#define AC_PINCTL_VREF_HIZ     (0) /* Hi-Z */
-#define AC_PINCTL_VREF_50      (1) /* 50% */
-#define AC_PINCTL_VREF_GRD     (2) /* ground */
-#define AC_PINCTL_VREF_80      (4) /* 80% */
-#define AC_PINCTL_VREF_100     (5) /* 100% */
-

 /* Amplifier capabilities */
 #define AC_AMPCAP_OFFSET       (0x7f<<0)  /* 0dB offset */
@@ -254,6 +247,11 @@ enum {

 /* Pin widget control - 8bit */
 #define AC_PINCTL_VREFEN       (0x7<<0)
+#define AC_PINCTL_VREF_HIZ     0   /* Hi-Z */
+#define AC_PINCTL_VREF_50      1   /* 50% */
+#define AC_PINCTL_VREF_GRD     2   /* ground */
+#define AC_PINCTL_VREF_80      4   /* 80% */
+#define AC_PINCTL_VREF_100     5   /* 100% */
 #define AC_PINCTL_IN_EN            (1<<5)
 #define AC_PINCTL_OUT_EN       (1<<6)
 #define AC_PINCTL_HP_EN            (1<<7)

Leave a Reply

Your email address will not be published. Required fields are marked *