diff options
author | Russell Bryant <russell@digium.com> | 2008-08-03 16:47:46 +0000 |
---|---|---|
committer | Russell Bryant <russell@digium.com> | 2008-08-03 16:47:46 +0000 |
commit | dc8675599500d40cbbde9a809eae062facf146ed (patch) | |
tree | d76f5176789981ba3f8ee905a4ba8ae926ff6b95 /drivers/dahdi/wcte12xp | |
parent | 09e579c8c3a365962a00b71a37b7f2d78bcd6422 (diff) |
Change all instances of printk in DAHDI to include a priority
(closes issue #11504)
Reported by: tzafrir
Patches:
20080717__issue11504_dahdi_printk_without_priority.diff uploaded by bbryant (license 36)
git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@4685 a0bf4364-ded3-4de4-8d8a-66a801d63aff
Diffstat (limited to 'drivers/dahdi/wcte12xp')
-rw-r--r-- | drivers/dahdi/wcte12xp/base.c | 4 | ||||
-rw-r--r-- | drivers/dahdi/wcte12xp/vpmadt032.c | 13 | ||||
-rw-r--r-- | drivers/dahdi/wcte12xp/wcte12xp.h | 4 |
3 files changed, 15 insertions, 6 deletions
diff --git a/drivers/dahdi/wcte12xp/base.c b/drivers/dahdi/wcte12xp/base.c index ab16e0d..51e7be7 100644 --- a/drivers/dahdi/wcte12xp/base.c +++ b/drivers/dahdi/wcte12xp/base.c @@ -194,7 +194,7 @@ static inline void cmd_decipher(struct t1 *wc, volatile unsigned char *readchunk if (ident == wc->rxident) { /* Store result */ wc->cmdq.cmds[x].data |= readchunk[CMD_BYTE(cs_slot,2,is_vpm)]; - /*printk("answer in rxident=%d cs_slot=%d is %d CMD_BYTE=%d jiffies=%d\n", ident, cs_slot, last_read_command, CMD_BYTE(cs_slot, 2), jiffies); */ + /*printk(KERN_INFO "answer in rxident=%d cs_slot=%d is %d CMD_BYTE=%d jiffies=%d\n", ident, cs_slot, last_read_command, CMD_BYTE(cs_slot, 2), jiffies); */ wc->cmdq.cmds[x].flags |= __CMD_FIN; if (wc->cmdq.cmds[x].flags & (__CMD_WR | __CMD_LEDS)) /* clear out writes (and leds) since they need no ack */ @@ -458,7 +458,7 @@ static void t1_release(struct t1 *wc) kfree(wc->chans[x]); } kfree(wc); - printk("Freed a Wildcard TE12xP\n"); + printk(KERN_INFO "Freed a Wildcard TE12xP\n"); } static void t4_serial_setup(struct t1 *wc) diff --git a/drivers/dahdi/wcte12xp/vpmadt032.c b/drivers/dahdi/wcte12xp/vpmadt032.c index 9e63923..1abba90 100644 --- a/drivers/dahdi/wcte12xp/vpmadt032.c +++ b/drivers/dahdi/wcte12xp/vpmadt032.c @@ -88,7 +88,7 @@ inline void vpm150m_cmd_dequeue(struct t1 *wc, volatile unsigned char *writechun } if (curcmd) { #if 0 - printk("Found command txident = %d, desc = 0x%x, addr = 0x%x, data = 0x%x\n", curcmd->txident, curcmd->desc, curcmd->addr, curcmd->data); + printk(KERN_DEBUG "Found command txident = %d, desc = 0x%x, addr = 0x%x, data = 0x%x\n", curcmd->txident, curcmd->desc, curcmd->addr, curcmd->data); #endif if (curcmd->flags & __VPM150M_RWPAGE) { /* Set CTRL access to page*/ @@ -782,6 +782,7 @@ void t1_vpm150m_init(struct t1 *wc) { set_bit(VPM150M_HPIRESET, &vpm150m->control); msleep(2000); gpakReadDspMemory(vpm150m->dspid, 0x1000, TEST_SIZE, msg); + debug_printk(1, ""); for (i = 0; i< TEST_SIZE; i++) printk("%x ", msg[i]); printk("\n"); @@ -790,10 +791,12 @@ void t1_vpm150m_init(struct t1 *wc) { gpakWriteDspMemory(vpm150m->dspid, 0x1000, TEST_SIZE, msg); gpakWriteDspMemory(vpm150m->dspid, 0x1000, TEST_SIZE, msg); gpakReadDspMemory(vpm150m->dspid, 0x1000, TEST_SIZE, msg); + debug_printk(1, ""); for (i = 0; i< TEST_SIZE; i++) printk("%x ", msg[i]); printk("\n"); gpakReadDspMemory(vpm150m->dspid, 0x1000, TEST_SIZE, msg); + debug_printk(1, ""); for (i = 0; i< TEST_SIZE; i++) printk("%x ", msg[i]); printk("\n"); @@ -801,10 +804,12 @@ void t1_vpm150m_init(struct t1 *wc) { msg[i] = 0xbeef; gpakWriteDspMemory(vpm150m->dspid, 0x1000, TEST_SIZE, msg); gpakReadDspMemory(vpm150m->dspid, 0x1000, TEST_SIZE, msg); + debug_printk(1, ""); for (i = 0; i< TEST_SIZE; i++) printk("%x ", msg[i]); printk("\n"); gpakReadDspMemory(vpm150m->dspid, 0x1000, TEST_SIZE, msg); + debug_printk(1, ""); for (i = 0; i< TEST_SIZE; i++) printk("%x ", msg[i]); printk("\n"); @@ -812,10 +817,12 @@ void t1_vpm150m_init(struct t1 *wc) { msg[i] = 0x1111; gpakWriteDspMemory(vpm150m->dspid, 0x1000, TEST_SIZE, msg); gpakReadDspMemory(vpm150m->dspid, 0x1000, TEST_SIZE, msg); + debug_printk(1, ""); for (i = 0; i< TEST_SIZE; i++) printk("%x ", msg[i]); printk("\n"); gpakReadDspMemory(vpm150m->dspid, 0x1000, TEST_SIZE, msg); + debug_printk(1, ""); for (i = 0; i< TEST_SIZE; i++) printk("%x ", msg[i]); printk("\n"); @@ -823,10 +830,12 @@ void t1_vpm150m_init(struct t1 *wc) { msg[i] = 0x2222; gpakWriteDspMemory(vpm150m->dspid, 0x1000, TEST_SIZE, msg); gpakReadDspMemory(vpm150m->dspid, 0x1000, TEST_SIZE, msg); + debug_printk(1, ""); for (i = 0; i< TEST_SIZE; i++) printk("%x ", msg[i]); printk("\n"); gpakReadDspMemory(vpm150m->dspid, 0x1000, TEST_SIZE, msg); + debug_printk(1, ""); for (i = 0; i< TEST_SIZE; i++) printk("%x ", msg[i]); printk("\n"); @@ -835,7 +844,7 @@ void t1_vpm150m_init(struct t1 *wc) { #if defined(HOTPLUG_FIRMWARE) if ((request_firmware(&firmware, vpmadt032_firmware, &pdev->dev) != 0) || !firmware) { - printk("VPMADT032: firmware %s not available from userspace\n", vpmadt032_firmware); + printk(KERN_NOTICE "VPMADT032: firmware %s not available from userspace\n", vpmadt032_firmware); goto failed_exit; } #else diff --git a/drivers/dahdi/wcte12xp/wcte12xp.h b/drivers/dahdi/wcte12xp/wcte12xp.h index 93bda0d..79b0295 100644 --- a/drivers/dahdi/wcte12xp/wcte12xp.h +++ b/drivers/dahdi/wcte12xp/wcte12xp.h @@ -88,8 +88,8 @@ #define NOT_VPM -1 -#define module_printk(fmt, args...) printk("%s: " fmt, te12xp_driver.name, ## args) -#define debug_printk(level, fmt, args...) if (debug >= level) printk("%s (%s): " fmt, te12xp_driver.name, __FUNCTION__, ## args) +#define module_printk(fmt, args...) printk(KERN_INFO "%s: " fmt, te12xp_driver.name, ## args) +#define debug_printk(level, fmt, args...) if (debug >= level) printk(KERN_DEBUG "%s (%s): " fmt, te12xp_driver.name, __FUNCTION__, ## args) extern spinlock_t ifacelock; struct command { |