[src/trunk]: src/sys/dev/pci/hdaudio remove duplicated code.

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/f7c3a6a52d0a
branches:  trunk
changeset: 771971:f7c3a6a52d0a
user:      christos <christos%NetBSD.org@localhost>
date:      Mon Dec 12 01:25:29 2011 +0000

description:
remove duplicated code.

diffstat:

 sys/dev/pci/hdaudio/hdafg.c |  35 ++++++++++-------------------------
 1 files changed, 10 insertions(+), 25 deletions(-)

diffs (84 lines):

diff -r 03f0e69c0d60 -r f7c3a6a52d0a sys/dev/pci/hdaudio/hdafg.c
--- a/sys/dev/pci/hdaudio/hdafg.c       Mon Dec 12 01:11:33 2011 +0000
+++ b/sys/dev/pci/hdaudio/hdafg.c       Mon Dec 12 01:25:29 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: hdafg.c,v 1.12 2011/12/11 15:13:58 jmcneill Exp $ */
+/* $NetBSD: hdafg.c,v 1.13 2011/12/12 01:25:29 christos Exp $ */
 
 /*
  * Copyright (c) 2009 Precedence Technologies Ltd <support%precedence.co.uk@localhost>
@@ -60,7 +60,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hdafg.c,v 1.12 2011/12/11 15:13:58 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hdafg.c,v 1.13 2011/12/12 01:25:29 christos Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -554,33 +554,18 @@
 }
 
 static void
-hdafg_widget_setconfig(struct hdaudio_widget *w)
+hdafg_widget_setconfig(struct hdaudio_widget *w, uint32_t cfg)
 {
        struct hdafg_softc *sc = w->w_afg;
 
        hdaudio_command(sc->sc_codec, w->w_nid,
-           CORB_SET_CONFIGURATION_DEFAULT_1, w->w_pin.config & 0xff);
+           CORB_SET_CONFIGURATION_DEFAULT_1, (cfg >>  0) & 0xff);
        hdaudio_command(sc->sc_codec, w->w_nid,
-           CORB_SET_CONFIGURATION_DEFAULT_2, (w->w_pin.config >> 8) & 0xff);
-       hdaudio_command(sc->sc_codec, w->w_nid,
-           CORB_SET_CONFIGURATION_DEFAULT_3, (w->w_pin.config >> 16) & 0xff);
+           CORB_SET_CONFIGURATION_DEFAULT_2, (cfg >>  8) & 0xff);
        hdaudio_command(sc->sc_codec, w->w_nid,
-           CORB_SET_CONFIGURATION_DEFAULT_4, (w->w_pin.config >> 24) & 0xff);
-}
-
-static void
-hdafg_widget_setbiosconfig(struct hdaudio_widget *w)
-{
-       struct hdafg_softc *sc = w->w_afg;
-
+           CORB_SET_CONFIGURATION_DEFAULT_3, (cfg >> 16) & 0xff);
        hdaudio_command(sc->sc_codec, w->w_nid,
-           CORB_SET_CONFIGURATION_DEFAULT_1, w->w_pin.biosconfig & 0xff);
-       hdaudio_command(sc->sc_codec, w->w_nid,
-           CORB_SET_CONFIGURATION_DEFAULT_2, (w->w_pin.biosconfig >> 8) & 0xff);
-       hdaudio_command(sc->sc_codec, w->w_nid,
-           CORB_SET_CONFIGURATION_DEFAULT_3, (w->w_pin.biosconfig >> 16) & 0xff);
-       hdaudio_command(sc->sc_codec, w->w_nid,
-           CORB_SET_CONFIGURATION_DEFAULT_4, (w->w_pin.biosconfig >> 24) & 0xff);
+           CORB_SET_CONFIGURATION_DEFAULT_4, (cfg >> 24) & 0xff);
 }
 
 static uint32_t
@@ -765,7 +750,7 @@
                break;
        case COP_AWCAP_TYPE_PIN_COMPLEX:
                hdafg_widget_pin_parse(w);
-               hdafg_widget_setconfig(w);
+               hdafg_widget_setconfig(w, w->w_pin.config);
                break;
        }
 }
@@ -3753,7 +3738,7 @@
                w = hdafg_widget_lookup(sc, nid);               
                if (w == NULL || w->w_type != COP_AWCAP_TYPE_PIN_COMPLEX)
                        continue;
-               hdafg_widget_setbiosconfig(w);
+               hdafg_widget_setconfig(w, w->w_pin.biosconfig);
        }
 
        if (w)
@@ -3810,7 +3795,7 @@
                /* restore pin widget configuration */
                if (w == NULL || w->w_type != COP_AWCAP_TYPE_PIN_COMPLEX)
                        continue;
-               hdafg_widget_setconfig(w);
+               hdafg_widget_setconfig(w, w->w_pin.config);
        }
        hda_delay(1000);