diff options
author | David Brown <davidb@codeaurora.org> | 2010-11-12 16:49:27 -0500 |
---|---|---|
committer | Daniel Walker <dwalker@codeaurora.org> | 2010-11-16 15:23:56 -0500 |
commit | 9be58f317d79278afc23186d861ada774cf386ea (patch) | |
tree | d2591f717e87f43912aba43ed35b87164b7bcd65 /arch/arm | |
parent | c8ddb2713c624f432fa5fe3c7ecffcdda46ea0d4 (diff) |
msm: smd: Reduce driver log chatter
The MSM smd driver logs numerous messages during startup that are
useful for debug purposes. Change some of these to pr_debug() to
match their purpose, and remove others that aren't really useful.
Cc: Brian Swetland <swetland@google.com>
Cc: Arve Hjønnevåg <arve@android.com>
Signed-off-by: David Brown <davidb@codeaurora.org>
Signed-off-by: Daniel Walker <dwalker@codeaurora.org>
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/mach-msm/smd.c | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/arch/arm/mach-msm/smd.c b/arch/arm/mach-msm/smd.c index f07dc7c738f0..657be73297db 100644 --- a/arch/arm/mach-msm/smd.c +++ b/arch/arm/mach-msm/smd.c | |||
@@ -14,6 +14,8 @@ | |||
14 | * | 14 | * |
15 | */ | 15 | */ |
16 | 16 | ||
17 | #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt | ||
18 | |||
17 | #include <linux/platform_device.h> | 19 | #include <linux/platform_device.h> |
18 | #include <linux/module.h> | 20 | #include <linux/module.h> |
19 | #include <linux/fs.h> | 21 | #include <linux/fs.h> |
@@ -89,7 +91,7 @@ static void smd_diag(void) | |||
89 | x = smem_find(ID_DIAG_ERR_MSG, SZ_DIAG_ERR_MSG); | 91 | x = smem_find(ID_DIAG_ERR_MSG, SZ_DIAG_ERR_MSG); |
90 | if (x != 0) { | 92 | if (x != 0) { |
91 | x[SZ_DIAG_ERR_MSG - 1] = 0; | 93 | x[SZ_DIAG_ERR_MSG - 1] = 0; |
92 | pr_info("smem: DIAG '%s'\n", x); | 94 | pr_debug("DIAG '%s'\n", x); |
93 | } | 95 | } |
94 | } | 96 | } |
95 | 97 | ||
@@ -312,7 +314,7 @@ static void smd_state_change(struct smd_channel *ch, | |||
312 | { | 314 | { |
313 | ch->last_state = next; | 315 | ch->last_state = next; |
314 | 316 | ||
315 | pr_info("SMD: ch %d %d -> %d\n", ch->n, last, next); | 317 | pr_debug("ch %d %d -> %d\n", ch->n, last, next); |
316 | 318 | ||
317 | switch (next) { | 319 | switch (next) { |
318 | case SMD_SS_OPENING: | 320 | case SMD_SS_OPENING: |
@@ -601,7 +603,7 @@ static int smd_alloc_channel(const char *name, uint32_t cid, uint32_t type) | |||
601 | ch->pdev.name = ch->name; | 603 | ch->pdev.name = ch->name; |
602 | ch->pdev.id = -1; | 604 | ch->pdev.id = -1; |
603 | 605 | ||
604 | pr_info("smd_alloc_channel() cid=%02d size=%05d '%s'\n", | 606 | pr_debug("smd_alloc_channel() cid=%02d size=%05d '%s'\n", |
605 | ch->n, ch->fifo_size, ch->name); | 607 | ch->n, ch->fifo_size, ch->name); |
606 | 608 | ||
607 | mutex_lock(&smd_creation_mutex); | 609 | mutex_lock(&smd_creation_mutex); |
@@ -621,7 +623,7 @@ static void smd_channel_probe_worker(struct work_struct *work) | |||
621 | 623 | ||
622 | shared = smem_find(ID_CH_ALLOC_TBL, sizeof(*shared) * 64); | 624 | shared = smem_find(ID_CH_ALLOC_TBL, sizeof(*shared) * 64); |
623 | if (!shared) { | 625 | if (!shared) { |
624 | pr_err("smd: cannot find allocation table\n"); | 626 | pr_err("cannot find allocation table\n"); |
625 | return; | 627 | return; |
626 | } | 628 | } |
627 | for (n = 0; n < 64; n++) { | 629 | for (n = 0; n < 64; n++) { |
@@ -725,8 +727,6 @@ int smd_close(smd_channel_t *ch) | |||
725 | { | 727 | { |
726 | unsigned long flags; | 728 | unsigned long flags; |
727 | 729 | ||
728 | pr_info("smd_close(%p)\n", ch); | ||
729 | |||
730 | if (ch == 0) | 730 | if (ch == 0) |
731 | return -1; | 731 | return -1; |
732 | 732 | ||
@@ -939,7 +939,6 @@ int smsm_set_sleep_duration(uint32_t delay) | |||
939 | int smd_core_init(void) | 939 | int smd_core_init(void) |
940 | { | 940 | { |
941 | int r; | 941 | int r; |
942 | pr_info("smd_core_init()\n"); | ||
943 | 942 | ||
944 | /* wait for essential items to be initialized */ | 943 | /* wait for essential items to be initialized */ |
945 | for (;;) { | 944 | for (;;) { |
@@ -992,15 +991,11 @@ int smd_core_init(void) | |||
992 | smsm_change_state(SMSM_STATE_APPS_DEM, ~0, 0); | 991 | smsm_change_state(SMSM_STATE_APPS_DEM, ~0, 0); |
993 | #endif | 992 | #endif |
994 | 993 | ||
995 | pr_info("smd_core_init() done\n"); | ||
996 | |||
997 | return 0; | 994 | return 0; |
998 | } | 995 | } |
999 | 996 | ||
1000 | static int __devinit msm_smd_probe(struct platform_device *pdev) | 997 | static int __devinit msm_smd_probe(struct platform_device *pdev) |
1001 | { | 998 | { |
1002 | pr_info("smd_init()\n"); | ||
1003 | |||
1004 | /* | 999 | /* |
1005 | * If we haven't waited for the ARM9 to boot up till now, | 1000 | * If we haven't waited for the ARM9 to boot up till now, |
1006 | * then we need to wait here. Otherwise this should just | 1001 | * then we need to wait here. Otherwise this should just |