diff options
| author |   John W. Linville <linville@tuxdriver.com> | 2012-07-12 13:44:50 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-07-12 13:44:50 -0400 |
| commit | 38a00840638b4932152bca48098dbfa069d942a2 (patch) | |
| tree | dd12897854f6df8aac237d5fd46551c74be8153a /drivers/bcma/core.c | |
| parent | ipv4: Remove tb_peers from fib_table. (diff) | |
| parent | ath5k: replace modparam_all_channels with CONFIG_ATH5K_TEST_CHANNELS (diff) | |
| download | linux-dev-38a00840638b4932152bca48098dbfa069d942a2.tar.xz linux-dev-38a00840638b4932152bca48098dbfa069d942a2.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Diffstat (limited to 'drivers/bcma/core.c')
| -rw-r--r-- | drivers/bcma/core.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/bcma/core.c b/drivers/bcma/core.c index bc6e89212ad3..63c8b470536f 100644 --- a/drivers/bcma/core.c +++ b/drivers/bcma/core.c @@ -75,7 +75,7 @@ void bcma_core_set_clockmode(struct bcma_device *core, udelay(10); } if (i) - pr_err("HT force timeout\n"); + bcma_err(core->bus, "HT force timeout\n"); break; case BCMA_CLKMODE_DYNAMIC: bcma_set32(core, BCMA_CLKCTLST, ~BCMA_CLKCTLST_FORCEHT); @@ -102,9 +102,9 @@ void bcma_core_pll_ctl(struct bcma_device *core, u32 req, u32 status, bool on) udelay(10); } if (i) - pr_err("PLL enable timeout\n"); + bcma_err(core->bus, "PLL enable timeout\n"); } else { - pr_warn("Disabling PLL not supported yet!\n"); + bcma_warn(core->bus, "Disabling PLL not supported yet!\n"); } } EXPORT_SYMBOL_GPL(bcma_core_pll_ctl); @@ -120,8 +120,8 @@ u32 bcma_core_dma_translation(struct bcma_device *core) else return BCMA_DMA_TRANSLATION_DMA32_CMT; default: - pr_err("DMA translation unknown for host %d\n", - core->bus->hosttype); + bcma_err(core->bus, "DMA translation unknown for host %d\n", + core->bus->hosttype); } return BCMA_DMA_TRANSLATION_NONE; } |