[src/trunk]: src/sys/dev/pci GC wc_rdreg and wc_rdchctl

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

details:   https://anonhg.NetBSD.org/src/rev/f6d70960fa7b
branches:  trunk
changeset: 789974:f6d70960fa7b
user:      joerg <joerg%NetBSD.org@localhost>
date:      Sat Sep 14 13:12:41 2013 +0000

description:
GC wc_rdreg and wc_rdchctl

diffstat:

 sys/dev/pci/esm.c |  21 ++-------------------
 1 files changed, 2 insertions(+), 19 deletions(-)

diffs (57 lines):

diff -r 7b3f0ccf67fb -r f6d70960fa7b sys/dev/pci/esm.c
--- a/sys/dev/pci/esm.c Sat Sep 14 13:12:03 2013 +0000
+++ b/sys/dev/pci/esm.c Sat Sep 14 13:12:41 2013 +0000
@@ -1,4 +1,4 @@
-/*      $NetBSD: esm.c,v 1.56 2012/01/30 19:41:19 drochner Exp $      */
+/*      $NetBSD: esm.c,v 1.57 2013/09/14 13:12:41 joerg Exp $      */
 
 /*-
  * Copyright (c) 2002, 2003 Matt Fredette
@@ -66,7 +66,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: esm.c,v 1.56 2012/01/30 19:41:19 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: esm.c,v 1.57 2013/09/14 13:12:41 joerg Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -132,9 +132,7 @@
 static inline void     wp_starttimer(struct esm_softc *);
 static inline void     wp_stoptimer(struct esm_softc *);
 
-static inline uint16_t wc_rdreg(struct esm_softc *, uint16_t);
 static inline void     wc_wrreg(struct esm_softc *, uint16_t, uint16_t);
-static inline uint16_t wc_rdchctl(struct esm_softc *, int);
 static inline void     wc_wrchctl(struct esm_softc *, int, uint16_t);
 
 static inline u_int    calc_timer_freq(struct esm_chinfo*);
@@ -508,14 +506,6 @@
 
 /* WaveCache */
 
-static inline uint16_t
-wc_rdreg(struct esm_softc *ess, uint16_t reg)
-{
-
-       bus_space_write_2(ess->st, ess->sh, PORT_WAVCACHE_INDEX, reg);
-       return bus_space_read_2(ess->st, ess->sh, PORT_WAVCACHE_DATA);
-}
-
 static inline void
 wc_wrreg(struct esm_softc *ess, uint16_t reg, uint16_t data)
 {
@@ -524,13 +514,6 @@
        bus_space_write_2(ess->st, ess->sh, PORT_WAVCACHE_DATA, data);
 }
 
-static inline uint16_t
-wc_rdchctl(struct esm_softc *ess, int ch)
-{
-
-       return wc_rdreg(ess, ch << 3);
-}
-
 static inline void
 wc_wrchctl(struct esm_softc *ess, int ch, uint16_t data)
 {