Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac802...

[karo-tx-linux.git] / drivers / bcma / core.c

diff --git a/drivers/bcma/core.c b/drivers/bcma/core.c
index 893f6e0c759fa75f0831ad6fa157567ab31a71a1..63c8b470536f7278c164f762c1033c0bd27ca9d9 100644 (file)
--- a/drivers/bcma/core.c
+++ b/drivers/bcma/core.c
@@ -30,6 +30,7 @@ void bcma_core_disable(struct bcma_device *core, u32 flags)
        udelay(10);
 
        bcma_awrite32(core, BCMA_RESET_CTL, BCMA_RESET_CTL_RESET);
+       bcma_aread32(core, BCMA_RESET_CTL);
        udelay(1);
 }
 EXPORT_SYMBOL_GPL(bcma_core_disable);
@@ -74,10 +75,10 @@ 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:
-               pr_warn("Dynamic clockmode not supported yet!\n");
+               bcma_set32(core, BCMA_CLKCTLST, ~BCMA_CLKCTLST_FORCEHT);
                break;
        }
 }
@@ -101,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);
@@ -119,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;
 }