OMAP3+: xSI: Trace cleaning

Removed LOG_NAME from dev_dbg traces as device name is already traced by dev_dbg()
Added channel number in function traces

Change-Id: Iad6d22e74328b35c5ecad7b9a24f36eba2a1bfc8
Signed-off-by: Djamil Elaidi <d-elaidi@ti.com>

3 files changed, 11 insertions, 9 deletions

diff --git a/drivers/staging/omap_hsi/hsi_driver_dma.c b/drivers/staging/omap_hsi/hsi_driver_dma.c
index bf27ad0bd780..a7ae619626ab 100644
--- a/drivers/staging/omap_hsi/hsi_driver_dma.c
+++ b/drivers/staging/omap_hsi/hsi_driver_dma.c
@@ -254,7 +254,7 @@ void hsi_driver_cancel_write_dma(struct hsi_channel *hsi_ch)
 
 	ccr = hsi_inw(hsi_ctrl->base, HSI_GDD_CCR_REG(lch));
 	if (!(ccr & HSI_CCR_ENABLE)) {
-		dev_dbg(&hsi_ch->dev->device, LOG_NAME "Write cancel on not "
+		dev_dbg(&hsi_ch->dev->device, "Write cancel on not "
 			"enabled logical channel %d CCR REG 0x%08X\n", lch,
 			ccr);
 		return;
@@ -292,7 +292,7 @@ void hsi_driver_cancel_read_dma(struct hsi_channel *hsi_ch)
 
 	reg = hsi_inw(hsi_ctrl->base, HSI_GDD_CCR_REG(lch));
 	if (!(reg & HSI_CCR_ENABLE)) {
-		dev_dbg(&hsi_ch->dev->device, LOG_NAME "Read cancel on not "
+		dev_dbg(&hsi_ch->dev->device, "Read cancel on not "
 			"enable logical channel %d CCR REG 0x%08X\n", lch, reg);
 		return;
 	}
diff --git a/drivers/staging/omap_hsi/hsi_driver_if.c b/drivers/staging/omap_hsi/hsi_driver_if.c
index b3e715c7a494..1a7ef1020376 100644
--- a/drivers/staging/omap_hsi/hsi_driver_if.c
+++ b/drivers/staging/omap_hsi/hsi_driver_if.c
@@ -264,7 +264,7 @@ int hsi_open(struct hsi_device *dev)
 		pr_err(LOG_NAME "Wrong HSI device %p\n", dev);
 		return -EINVAL;
 	}
-	dev_dbg(dev->device.parent, "%s\n", __func__);
+	dev_dbg(dev->device.parent, "%s ch %d\n", __func__, dev->n_ch);
 
 	ch = dev->ch;
 	if (!ch->read_done || !ch->write_done) {
@@ -331,8 +331,8 @@ int hsi_write(struct hsi_device *dev, u32 * addr, unsigned int size)
 			dev, addr, size);
 		return -EINVAL;
 	}
-	dev_dbg(dev->device.parent, "%s @%x, size %d u32\n", __func__,
-		(u32) addr, size);
+	dev_dbg(dev->device.parent, "%s ch %d, @%x, size %d u32\n", __func__,
+		dev->n_ch, (u32) addr, size);
 
 	if (unlikely(!(dev->ch->flags & HSI_CH_OPEN))) {
 		dev_err(dev->device.parent, "HSI device NOT open\n");
@@ -375,6 +375,7 @@ int hsi_write(struct hsi_device *dev, u32 * addr, unsigned int size)
 	if (unlikely(err < 0)) {
 		ch->write_data.addr = NULL;
 		ch->write_data.size = 0;
+		dev_err(dev->device.parent, "Failed to program write\n");
 	}
 
 	spin_unlock_bh(&ch->hsi_port->hsi_controller->lock);
@@ -411,8 +412,8 @@ int hsi_read(struct hsi_device *dev, u32 * addr, unsigned int size)
 			"hsi_device %p data %p count %d", dev, addr, size);
 		return -EINVAL;
 	}
-	dev_dbg(dev->device.parent, "%s @%x, size %d u32\n", __func__,
-		(u32) addr, size);
+	dev_dbg(dev->device.parent, "%s ch %d, @%x, size %d u32\n", __func__,
+		dev->n_ch, (u32) addr, size);
 
 	if (unlikely(!(dev->ch->flags & HSI_CH_OPEN))) {
 		dev_err(dev->device.parent, "HSI device NOT open\n");
@@ -452,6 +453,7 @@ int hsi_read(struct hsi_device *dev, u32 * addr, unsigned int size)
 	if (unlikely(err < 0)) {
 		ch->read_data.addr = NULL;
 		ch->read_data.size = 0;
+		dev_err(dev->device.parent, "Failed to program read\n");
 	}
 
 done:
@@ -826,7 +828,7 @@ void hsi_close(struct hsi_device *dev)
 		pr_err(LOG_NAME "Trying to close wrong HSI device %p\n", dev);
 		return;
 	}
-	dev_dbg(dev->device.parent, "%s\n", __func__);
+	dev_dbg(dev->device.parent, "%s ch %d\n", __func__, dev->n_ch);
 
 	hsi_ctrl = dev->ch->hsi_port->hsi_controller;
 
diff --git a/drivers/staging/omap_hsi/hsi_driver_int.c b/drivers/staging/omap_hsi/hsi_driver_int.c
index 9758c2e7f9e9..fdf1269a2e44 100644
--- a/drivers/staging/omap_hsi/hsi_driver_int.c
+++ b/drivers/staging/omap_hsi/hsi_driver_int.c
@@ -189,7 +189,7 @@ void hsi_driver_cancel_write_interrupt(struct hsi_channel *ch)
 			 HSI_SYS_MPU_ENABLE_CH_REG(port, p->n_irq, channel));
 
 	if (!(enable & HSI_HST_DATAACCEPT(channel))) {
-		dev_dbg(&ch->dev->device, LOG_NAME "Write cancel on not "
+		dev_dbg(&ch->dev->device, "Write cancel on not "
 			"enabled channel %d ENABLE REG 0x%08X", channel,
 			enable);
 		return;