From ad59317fbfddd1d6624e8128f556d85e7e17d935 Mon Sep 17 00:00:00 2001 From: Russell Bryant Date: Sun, 3 Aug 2008 16:47:46 +0000 Subject: 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 --- drivers/dahdi/dahdi_dynamic.c | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) (limited to 'drivers/dahdi/dahdi_dynamic.c') diff --git a/drivers/dahdi/dahdi_dynamic.c b/drivers/dahdi/dahdi_dynamic.c index 44d43ec..729de00 100644 --- a/drivers/dahdi/dahdi_dynamic.c +++ b/drivers/dahdi/dahdi_dynamic.c @@ -157,9 +157,9 @@ static void checkmaster(void) master->master = 1; spin_unlock_irqrestore(&dlock, flags); if (master) - printk("TDMoX: New master: %s\n", master->span.name); + printk(KERN_INFO "TDMoX: New master: %s\n", master->span.name); else - printk("TDMoX: No master.\n"); + printk(KERN_INFO "TDMoX: No master.\n"); } static void ztd_sendmessage(struct dahdi_dynamic *z) @@ -291,7 +291,7 @@ void dahdi_dynamic_receive(struct dahdi_span *span, unsigned char *msg, int msgl spin_unlock_irqrestore(&dlock, flags); newerr = ERR_LEN; if (newerr != ztd->err) { - printk("Span %s: Insufficient samples for header (only %d)\n", span->name, msglen); + printk(KERN_NOTICE "Span %s: Insufficient samples for header (only %d)\n", span->name, msglen); } ztd->err = newerr; return; @@ -302,7 +302,7 @@ void dahdi_dynamic_receive(struct dahdi_span *span, unsigned char *msg, int msgl spin_unlock_irqrestore(&dlock, flags); newerr = ERR_NSAMP | msg[0]; if (newerr != ztd->err) { - printk("Span %s: Expected %d samples, but receiving %d\n", span->name, DAHDI_CHUNKSIZE, msg[0]); + printk(KERN_NOTICE "Span %s: Expected %d samples, but receiving %d\n", span->name, DAHDI_CHUNKSIZE, msg[0]); } ztd->err = newerr; return; @@ -320,7 +320,7 @@ void dahdi_dynamic_receive(struct dahdi_span *span, unsigned char *msg, int msgl spin_unlock_irqrestore(&dlock, flags); newerr = ERR_NCHAN | nchans; if (newerr != ztd->err) { - printk("Span %s: Expected %d channels, but receiving %d\n", span->name, span->channels, nchans); + printk(KERN_NOTICE "Span %s: Expected %d channels, but receiving %d\n", span->name, span->channels, nchans); } ztd->err = newerr; return; @@ -345,7 +345,7 @@ void dahdi_dynamic_receive(struct dahdi_span *span, unsigned char *msg, int msgl spin_unlock_irqrestore(&dlock, flags); newerr = ERR_LEN | xlen; if (newerr != ztd->err) { - printk("Span %s: Expected message size %d, but was %d instead\n", span->name, xlen, msglen); + printk(KERN_NOTICE "Span %s: Expected message size %d, but was %d instead\n", span->name, xlen, msglen); } ztd->err = newerr; return; @@ -402,7 +402,7 @@ void dahdi_dynamic_receive(struct dahdi_span *span, unsigned char *msg, int msgl /* note if we had a missing packet */ if (rxpos != rxcnt) - printk("Span %s: Expected seq no %d, but received %d instead\n", span->name, rxcnt, rxpos); + printk(KERN_NOTICE "Span %s: Expected seq no %d, but received %d instead\n", span->name, rxcnt, rxpos); /* If this is our master span, then run everything */ if (master) @@ -472,7 +472,7 @@ static int destroy_dynamic(struct dahdi_dynamic_span *zds) /* Don't destroy span until it is in use */ if (z->usecount) { spin_unlock_irqrestore(&dlock, flags); - printk("Attempt to destroy dynamic span while it is in use\n"); + printk(KERN_NOTICE "Attempt to destroy dynamic span while it is in use\n"); return -EBUSY; } /* Unlink it */ @@ -512,7 +512,7 @@ static int ztd_open(struct dahdi_chan *chan) z->usecount++; } if(!try_module_get(THIS_MODULE)) - printk("TDMoX: Unable to increment module use count\n"); + printk(KERN_NOTICE "TDMoX: Unable to increment module use count\n"); return 0; } @@ -542,11 +542,11 @@ static int create_dynamic(struct dahdi_dynamic_span *zds) int bufsize; if (zds->numchans < 1) { - printk("Can't be less than 1 channel (%d)!\n", zds->numchans); + printk(KERN_NOTICE "Can't be less than 1 channel (%d)!\n", zds->numchans); return -EINVAL; } if (zds->numchans >= DAHDI_DYNAMIC_MAX_CHANS) { - printk("Can't create dynamic span with greater than %d channels. See ztdynamic.c and increase DAHDI_DYNAMIC_MAX_CHANS\n", zds->numchans); + printk(KERN_NOTICE "Can't create dynamic span with greater than %d channels. See ztdynamic.c and increase DAHDI_DYNAMIC_MAX_CHANS\n", zds->numchans); return -EINVAL; } @@ -636,7 +636,7 @@ static int create_dynamic(struct dahdi_dynamic_span *zds) /* Another race -- should let the module get unloaded while we have it here */ if (!ztd) { - printk("No such driver '%s' for dynamic span\n", zds->driver); + printk(KERN_NOTICE "No such driver '%s' for dynamic span\n", zds->driver); dynamic_destroy(z); return -EINVAL; } @@ -644,7 +644,7 @@ static int create_dynamic(struct dahdi_dynamic_span *zds) /* Create the stuff */ z->pvt = ztd->create(&z->span, z->addr); if (!z->pvt) { - printk("Driver '%s' (%s) rejected address '%s'\n", ztd->name, ztd->desc, z->addr); + printk(KERN_NOTICE "Driver '%s' (%s) rejected address '%s'\n", ztd->name, ztd->desc, z->addr); /* Creation failed */ return -EINVAL; } @@ -654,7 +654,7 @@ static int create_dynamic(struct dahdi_dynamic_span *zds) /* Whee! We're created. Now register the span */ if (dahdi_register(&z->span, 0)) { - printk("Unable to register span '%s'\n", z->span.name); + printk(KERN_NOTICE "Unable to register span '%s'\n", z->span.name); dynamic_destroy(z); return -EINVAL; } @@ -700,7 +700,7 @@ static int ztdynamic_ioctl(unsigned int cmd, unsigned long data) if (copy_from_user(&zds, (struct dahdi_dynamic_span *)data, sizeof(zds))) return -EFAULT; if (debug) - printk("Dynamic Create\n"); + printk(KERN_DEBUG "Dynamic Create\n"); res = create_dynamic(&zds); if (res < 0) return res; @@ -713,7 +713,7 @@ static int ztdynamic_ioctl(unsigned int cmd, unsigned long data) if (copy_from_user(&zds, (struct dahdi_dynamic_span *)data, sizeof(zds))) return -EFAULT; if (debug) - printk("Dynamic Destroy\n"); + printk(KERN_DEBUG "Dynamic Destroy\n"); return destroy_dynamic(&zds); } @@ -822,7 +822,7 @@ int ztdynamic_init(void) #ifdef ENABLE_TASKLETS tasklet_init(&ztd_tlet, ztd_tasklet, 0); #endif - printk("DAHDI Dynamic Span support LOADED\n"); + printk(KERN_INFO "DAHDI Dynamic Span support LOADED\n"); return 0; } @@ -836,7 +836,7 @@ void ztdynamic_cleanup(void) #endif dahdi_set_dynamic_ioctl(NULL); del_timer(&alarmcheck); - printk("DAHDI Dynamic Span support unloaded\n"); + printk(KERN_INFO "DAHDI Dynamic Span support unloaded\n"); } module_param(debug, int, 0600); -- cgit v1.2.3