2 files changed, 5 insertions, 9 deletions

diff --git a/sound/pci/hda/hda_codec.h b/sound/pci/hda/hda_codec.h
index 40520e9d5a4b..c12bc4e8840f 100644
--- a/sound/pci/hda/hda_codec.h
+++ b/sound/pci/hda/hda_codec.h
@@ -479,7 +479,7 @@ struct hda_codec_ops {
 struct hda_amp_info {
         u32 key;                /* hash key */
         u32 amp_caps;           /* amp capabilities */
-        u16 vol[2];             /* current volume & mute*/
+        u16 vol[2];             /* current volume & mute */
         u16 status;             /* update flag */
         u16 next;               /* next link */
 };
diff --git a/sound/pci/hda/hda_proc.c b/sound/pci/hda/hda_proc.c
index c2f0fe85bf35..d737f17695a3 100644
--- a/sound/pci/hda/hda_proc.c
+++ b/sound/pci/hda/hda_proc.c
@@ -52,10 +52,9 @@ static void print_amp_caps(struct snd_info_buffer *buffer,
                            struct hda_codec *codec, hda_nid_t nid, int dir)
 {
         unsigned int caps;
-        if (dir == HDA_OUTPUT)
-                caps = snd_hda_param_read(codec, nid, AC_PAR_AMP_OUT_CAP);
-        else
-                caps = snd_hda_param_read(codec, nid, AC_PAR_AMP_IN_CAP);
+        caps = snd_hda_param_read(codec, nid,
+                                  dir == HDA_OUTPUT ?
+                                    AC_PAR_AMP_OUT_CAP : AC_PAR_AMP_IN_CAP);
         if (caps == -1 || caps == 0) {
                 snd_iprintf(buffer, "N/A\n");
                 return;
@@ -74,10 +73,7 @@ static void print_amp_vals(struct snd_info_buffer *buffer,
         unsigned int val;
         int i;
 
-        if (dir == HDA_OUTPUT)
-                dir = AC_AMP_GET_OUTPUT;
-        else
-                dir = AC_AMP_GET_INPUT;
+        dir = dir == HDA_OUTPUT ? AC_AMP_GET_OUTPUT : AC_AMP_GET_INPUT;
         for (i = 0; i < indices; i++) {
                 snd_iprintf(buffer, " [");
                 if (stereo) {