diff --git a/drivers/dahdi/xpp/card_fxs.c b/drivers/dahdi/xpp/card_fxs.c index ce36640..2de479e 100644 --- a/drivers/dahdi/xpp/card_fxs.c +++ b/drivers/dahdi/xpp/card_fxs.c @@ -1957,7 +1957,7 @@ static DEVICE_ATTR_WRITER(fxs_ring_registers_store, dev, buf, count) regno); goto invalid_input; } - XPD_INFO(xpd, "%s Indirect 0x%X <=== 0x%X 0x%X\n", + XPD_DBG(SIGNAL, xpd, "%s Indirect 0x%X <=== 0x%X 0x%X\n", rtype_name, regno, h_val, l_val); } else { if (ret != 3) { @@ -1968,7 +1968,7 @@ static DEVICE_ATTR_WRITER(fxs_ring_registers_store, dev, buf, count) } l_val = h_val; h_val = 0; - XPD_INFO(xpd, "%s Direct 0x%X <=== 0x%X\n", + XPD_DBG(SIGNAL, xpd, "%s Direct 0x%X <=== 0x%X\n", rtype_name, regno, h_val); } spin_lock_irqsave(&xpd->lock, flags); diff --git a/drivers/dahdi/xpp/xbus-core.c b/drivers/dahdi/xpp/xbus-core.c index f17119d..c74cf29 100644 --- a/drivers/dahdi/xpp/xbus-core.c +++ b/drivers/dahdi/xpp/xbus-core.c @@ -199,7 +199,7 @@ static void xbus_destroy(struct kref *kref) int num; xbus = kref_to_xbus(kref); - XBUS_NOTICE(xbus, "%s\n", __func__); + XBUS_DBG(DEVICES, xbus, "%s\n", __func__); num = xbus->num; xbuses_array[num].shutting_down = 1; xbus_sysfs_remove(xbus); @@ -1066,7 +1066,7 @@ void xbus_unregister_dahdi_device(xbus_t *xbus) int i; int ret; - XBUS_NOTICE(xbus, "%s\n", __func__); + XBUS_DBG(DEVICES, xbus, "%s\n", __func__); ret = mutex_lock_interruptible(&dahdi_registration_mutex); if (ret < 0) { XBUS_ERR(xbus, "dahdi_registration_mutex already taken\n"); @@ -1085,8 +1085,8 @@ void xbus_unregister_dahdi_device(xbus_t *xbus) } if (xbus->ddev) { dahdi_unregister_device(xbus->ddev); - XBUS_NOTICE(xbus, "%s: finished dahdi_unregister_device()\n", - __func__); + XBUS_DBG(DEVICES, xbus, + "%s: finished dahdi_unregister_device()\n", __func__); xbus_free_ddev(xbus); } for (i = 0; i < MAX_XPDS; i++) { @@ -1220,8 +1220,7 @@ static void worker_reset(xbus_t *xbus) name = (xbus) ? xbus->busname : "detached"; DBG(DEVICES, "%s\n", name); if (!worker->xpds_init_done) { - NOTICE("%s: worker(%s)->xpds_init_done=%d\n", __func__, name, - worker->xpds_init_done); + XBUS_NOTICE(xbus, "XPDS initialization was not finished\n"); } spin_lock_irqsave(&worker->worker_lock, flags); list_for_each_safe(card, next_card, &worker->card_list) { diff --git a/drivers/dahdi/xpp/xpp_dahdi.c b/drivers/dahdi/xpp/xpp_dahdi.c index 3e54ca2..8e6523d 100644 --- a/drivers/dahdi/xpp/xpp_dahdi.c +++ b/drivers/dahdi/xpp/xpp_dahdi.c @@ -476,7 +476,7 @@ int phonedev_alloc_channels(xpd_t *xpd, int channels) int old_channels = phonedev->channels; unsigned int x; - XPD_NOTICE(xpd, "Reallocating channels: %d -> %d\n", + XPD_DBG(DEVICES, xpd, "Reallocating channels: %d -> %d\n", old_channels, channels); phonedev_cleanup(xpd); phonedev->channels = channels;