--- dahdi_dynamic.c 2008-09-24 13:41:42.693292667 +0700 +++ dahdi_dynamic_modprintk.c 2008-09-24 13:39:45.981294238 +0700 @@ -43,6 +43,7 @@ #include #include +#define module_printk(level, fmt, args...) printk(level "%s: " fmt, THIS_MODULE->name, ## args) /* * Tasklets provide better system interactive response at the cost of the @@ -175,9 +176,9 @@ } spin_unlock_irqrestore(&dlock, flags); if (master) - printk(KERN_INFO "TDMoX: New master: %s\n", master->span.name); + module_printk(KERN_INFO, "TDMoX: New master: %s\n", master->span.name); else - printk(KERN_INFO "TDMoX: No master.\n"); + module_printk(KERN_INFO, "TDMoX: No master.\n"); } static void ztd_sendmessage(struct dahdi_dynamic *z) @@ -325,7 +326,7 @@ spin_unlock_irqrestore(&dlock, flags); newerr = ERR_LEN; if (newerr != ztd->err) { - printk(KERN_NOTICE "Span %s: Insufficient samples for header (only %d)\n", span->name, msglen); + module_printk(KERN_NOTICE, "Span %s: Insufficient samples for header (only %d)\n", span->name, msglen); } ztd->err = newerr; return; @@ -336,7 +337,7 @@ spin_unlock_irqrestore(&dlock, flags); newerr = ERR_NSAMP | msg[0]; if (newerr != ztd->err) { - printk(KERN_NOTICE "Span %s: Expected %d samples, but receiving %d\n", span->name, DAHDI_CHUNKSIZE, msg[0]); + module_printk(KERN_NOTICE, "Span %s: Expected %d samples, but receiving %d\n", span->name, DAHDI_CHUNKSIZE, msg[0]); } ztd->err = newerr; return; @@ -354,7 +355,7 @@ spin_unlock_irqrestore(&dlock, flags); newerr = ERR_NCHAN | nchans; if (newerr != ztd->err) { - printk(KERN_NOTICE "Span %s: Expected %d channels, but receiving %d\n", span->name, span->channels, nchans); + module_printk(KERN_NOTICE, "Span %s: Expected %d channels, but receiving %d\n", span->name, span->channels, nchans); } ztd->err = newerr; return; @@ -379,7 +380,7 @@ spin_unlock_irqrestore(&dlock, flags); newerr = ERR_LEN | xlen; if (newerr != ztd->err) { - printk(KERN_NOTICE "Span %s: Expected message size %d, but was %d instead\n", span->name, xlen, msglen); + module_printk(KERN_NOTICE, "Span %s: Expected message size %d, but was %d instead\n", span->name, xlen, msglen); } ztd->err = newerr; return; @@ -434,7 +435,7 @@ /* note if we had a missing packet */ if (rxpos != rxcnt) - printk(KERN_NOTICE "Span %s: Expected seq no %d, but received %d instead\n", span->name, rxcnt, rxpos); + module_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) @@ -512,7 +513,7 @@ /* Don't destroy span until it is in use */ if (z->usecount) { spin_unlock_irqrestore(&dlock, flags); - printk(KERN_NOTICE "Attempt to destroy dynamic span while it is in use\n"); + module_printk(KERN_NOTICE, "Attempt to destroy dynamic span while it is in use\n"); return -EBUSY; } /* Unlink it */ @@ -552,7 +553,7 @@ z->usecount++; } if(!try_module_get(THIS_MODULE)) - printk(KERN_NOTICE "TDMoX: Unable to increment module use count\n"); + module_printk(KERN_NOTICE, "TDMoX: Unable to increment module use count\n"); return 0; } @@ -582,11 +583,11 @@ int bufsize; if (zds->numchans < 1) { - printk(KERN_NOTICE "Can't be less than 1 channel (%d)!\n", zds->numchans); + module_printk(KERN_NOTICE, "Can't be less than 1 channel (%d)!\n", zds->numchans); return -EINVAL; } if (zds->numchans >= DAHDI_DYNAMIC_MAX_CHANS) { - 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); + module_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; } @@ -685,7 +686,7 @@ /* Another race -- should let the module get unloaded while we have it here */ if (!ztd) { - printk(KERN_NOTICE "No such driver '%s' for dynamic span\n", zds->driver); + module_printk(KERN_NOTICE, "No such driver '%s' for dynamic span\n", zds->driver); dynamic_destroy(z); return -EINVAL; } @@ -693,7 +694,7 @@ /* Create the stuff */ z->pvt = ztd->create(&z->span, z->addr); if (!z->pvt) { - printk(KERN_NOTICE "Driver '%s' (%s) rejected address '%s'\n", ztd->name, ztd->desc, z->addr); + module_printk(KERN_NOTICE, "Driver '%s' (%s) rejected address '%s'\n", ztd->name, ztd->desc, z->addr); /* Creation failed */ return -EINVAL; } @@ -703,7 +704,7 @@ /* Whee! We're created. Now register the span */ if (dahdi_register(&z->span, 0)) { - printk(KERN_NOTICE "Unable to register span '%s'\n", z->span.name); + module_printk(KERN_NOTICE, "Unable to register span '%s'\n", z->span.name); dynamic_destroy(z); return -EINVAL; } @@ -749,7 +750,7 @@ if (copy_from_user(&zds, (struct dahdi_dynamic_span *)data, sizeof(zds))) return -EFAULT; if (debug) - printk(KERN_DEBUG "Dynamic Create\n"); + module_printk(KERN_DEBUG, "Dynamic Create\n"); res = create_dynamic(&zds); if (res < 0) return res; @@ -762,7 +763,7 @@ if (copy_from_user(&zds, (struct dahdi_dynamic_span *)data, sizeof(zds))) return -EFAULT; if (debug) - printk(KERN_DEBUG "Dynamic Destroy\n"); + module_printk(KERN_DEBUG, "Dynamic Destroy\n"); return destroy_dynamic(&zds); } @@ -953,7 +954,7 @@ #ifdef ENABLE_TASKLETS tasklet_init(&ztd_tlet, ztd_tasklet, 0); #endif - printk(KERN_INFO "DAHDI Dynamic Span support LOADED, rxfifo=%d\n", rxfifo); + module_printk(KERN_INFO, "DAHDI Dynamic Span support LOADED, rxfifo=%d\n", rxfifo); return 0; } @@ -968,7 +969,7 @@ dahdi_set_dynamic_ioctl(NULL); del_timer(&alarmcheck); proc_cleanup (); - printk(KERN_INFO "DAHDI Dynamic Span support unloaded\n"); + module_printk(KERN_INFO, "DAHDI Dynamic Span support unloaded\n"); } module_param(debug, int, 0600);