ath9k: use ath_hw for DPRINTF() and debug init/exit
DPRINTF() is used in hw specific related code, as such ensure we don't rely on the private driver core ath_softc struct when calling it. Drivers can then implement their own DPRINTF() as they see fit. Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
committed by
John W. Linville
parent
d519e17e2d
commit
4d6b228d84
@@ -23,12 +23,12 @@ module_param_named(debug, ath9k_debug, uint, 0);
|
||||
|
||||
static struct dentry *ath9k_debugfs_root;
|
||||
|
||||
void DPRINTF(struct ath_softc *sc, int dbg_mask, const char *fmt, ...)
|
||||
void DPRINTF(struct ath_hw *ah, int dbg_mask, const char *fmt, ...)
|
||||
{
|
||||
if (!sc)
|
||||
if (!ah->ah_sc)
|
||||
return;
|
||||
|
||||
if (sc->debug.debug_mask & dbg_mask) {
|
||||
if (ah->ah_sc->debug.debug_mask & dbg_mask) {
|
||||
va_list args;
|
||||
|
||||
va_start(args, fmt);
|
||||
@@ -568,8 +568,10 @@ static const struct file_operations fops_xmit = {
|
||||
.owner = THIS_MODULE
|
||||
};
|
||||
|
||||
int ath9k_init_debug(struct ath_softc *sc)
|
||||
int ath9k_init_debug(struct ath_hw *ah)
|
||||
{
|
||||
struct ath_softc *sc = ah->ah_sc;
|
||||
|
||||
sc->debug.debug_mask = ath9k_debug;
|
||||
|
||||
if (!ath9k_debugfs_root)
|
||||
@@ -619,12 +621,14 @@ int ath9k_init_debug(struct ath_softc *sc)
|
||||
|
||||
return 0;
|
||||
err:
|
||||
ath9k_exit_debug(sc);
|
||||
ath9k_exit_debug(ah);
|
||||
return -ENOMEM;
|
||||
}
|
||||
|
||||
void ath9k_exit_debug(struct ath_softc *sc)
|
||||
void ath9k_exit_debug(struct ath_hw *ah)
|
||||
{
|
||||
struct ath_softc *sc = ah->ah_sc;
|
||||
|
||||
debugfs_remove(sc->debug.debugfs_xmit);
|
||||
debugfs_remove(sc->debug.debugfs_wiphy);
|
||||
debugfs_remove(sc->debug.debugfs_rcstat);
|
||||
|
Reference in New Issue
Block a user