Merge branch 'stable/bug-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git...

[pandora-kernel.git] / arch / arm / mach-msm / smd.c

diff --git a/arch/arm/mach-msm/smd.c b/arch/arm/mach-msm/smd.c
index f07dc7c..657be73 100644 (file)
--- a/arch/arm/mach-msm/smd.c
+++ b/arch/arm/mach-msm/smd.c
@@ -14,6 +14,8 @@
  *
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/platform_device.h>
 #include <linux/module.h>
 #include <linux/fs.h>
@@ -89,7 +91,7 @@ static void smd_diag(void)
        x = smem_find(ID_DIAG_ERR_MSG, SZ_DIAG_ERR_MSG);
        if (x != 0) {
                x[SZ_DIAG_ERR_MSG - 1] = 0;
-               pr_info("smem: DIAG '%s'\n", x);
+               pr_debug("DIAG '%s'\n", x);
        }
 }
 
@@ -312,7 +314,7 @@ static void smd_state_change(struct smd_channel *ch,
 {
        ch->last_state = next;
 
-       pr_info("SMD: ch %d %d -> %d\n", ch->n, last, next);
+       pr_debug("ch %d %d -> %d\n", ch->n, last, next);
 
        switch (next) {
        case SMD_SS_OPENING:
@@ -601,7 +603,7 @@ static int smd_alloc_channel(const char *name, uint32_t cid, uint32_t type)
        ch->pdev.name = ch->name;
        ch->pdev.id = -1;
 
-       pr_info("smd_alloc_channel() cid=%02d size=%05d '%s'\n",
+       pr_debug("smd_alloc_channel() cid=%02d size=%05d '%s'\n",
                ch->n, ch->fifo_size, ch->name);
 
        mutex_lock(&smd_creation_mutex);
@@ -621,7 +623,7 @@ static void smd_channel_probe_worker(struct work_struct *work)
 
        shared = smem_find(ID_CH_ALLOC_TBL, sizeof(*shared) * 64);
        if (!shared) {
-               pr_err("smd: cannot find allocation table\n");
+               pr_err("cannot find allocation table\n");
                return;
        }
        for (n = 0; n < 64; n++) {
@@ -725,8 +727,6 @@ int smd_close(smd_channel_t *ch)
 {
        unsigned long flags;
 
-       pr_info("smd_close(%p)\n", ch);
-
        if (ch == 0)
                return -1;
 
@@ -939,7 +939,6 @@ int smsm_set_sleep_duration(uint32_t delay)
 int smd_core_init(void)
 {
        int r;
-       pr_info("smd_core_init()\n");
 
        /* wait for essential items to be initialized */
        for (;;) {
@@ -992,15 +991,11 @@ int smd_core_init(void)
        smsm_change_state(SMSM_STATE_APPS_DEM, ~0, 0);
 #endif
 
-       pr_info("smd_core_init() done\n");
-
        return 0;
 }
 
 static int __devinit msm_smd_probe(struct platform_device *pdev)
 {
-       pr_info("smd_init()\n");
-
        /*
         * If we haven't waited for the ARM9 to boot up till now,
         * then we need to wait here. Otherwise this should just