1 files changed, 7 insertions, 21 deletions

diff --git a/linux/drivers/media/video/cs53l32a.c b/linux/drivers/media/video/cs53l32a.c
index 766ab4a1c..7af5edc33 100644
--- a/linux/drivers/media/video/cs53l32a.c
+++ b/linux/drivers/media/video/cs53l32a.c
@@ -28,7 +28,7 @@
 #include <linux/i2c.h>
 #include <linux/i2c-id.h>
 #include <linux/videodev.h>
-#include <media/audiochip.h>
+#include <media/v4l2-common.h>
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
 #include "i2c-compat.h"
 #include <linux/slab.h>
@@ -48,20 +48,6 @@ MODULE_PARM(debug, "i");
 
 MODULE_PARM_DESC(debug, "Debugging messages\n\t\t\t0=Off (default), 1=On");
 
-#define cs53l32a_dbg(fmt, arg...) \
-	do { \
-		if (debug) \
-			printk(KERN_INFO "%s debug %d-%04x: " fmt, client->driver->name, \
-			       i2c_adapter_id(client->adapter), client->addr , ## arg); \
-	} while (0)
-
-#define cs53l32a_err(fmt, arg...) do { \
-	printk(KERN_ERR "%s %d-%04x: " fmt, client->driver->name, \
-		i2c_adapter_id(client->adapter), client->addr , ## arg); } while (0)
-#define cs53l32a_info(fmt, arg...) do { \
-	printk(KERN_INFO "%s %d-%04x: " fmt, client->driver->name, \
-		i2c_adapter_id(client->adapter), client->addr , ## arg); } while (0)
-
 static unsigned short normal_i2c[] = { 0x22 >> 1, I2C_CLIENT_END };
 
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,13)
@@ -95,7 +81,7 @@ static int cs53l32a_command(struct i2c_client *client, unsigned int cmd,
 		   the second goes through the PGA. Hence there are three
 		   possible inputs to choose from. */
 		if (input->index > 2) {
-			cs53l32a_err("Invalid input %d.\n", input->index);
+			v4l_err(client, "Invalid input %d.\n", input->index);
 			return -EINVAL;
 		}
 		cs53l32a_write(client, 0x01, 0x01 + (input->index << 4));
@@ -135,9 +121,9 @@ static int cs53l32a_command(struct i2c_client *client, unsigned int cmd,
 			u8 m = cs53l32a_read(client, 0x03);
 			s8 vol = cs53l32a_read(client, 0x04);
 
-			cs53l32a_info("Input:  %d%s\n", (v >> 4) & 3,
+			v4l_info(client, "Input:  %d%s\n", (v >> 4) & 3,
 				      (m & 0xC0) ? " (muted)" : "");
-			cs53l32a_info("Volume: %d dB\n", vol);
+			v4l_info(client, "Volume: %d dB\n", vol);
 			break;
 		}
 
@@ -183,12 +169,12 @@ static int cs53l32a_attach(struct i2c_adapter *adapter, int address,
 	client->flags = I2C_CLIENT_ALLOW_USE;
 	snprintf(client->name, sizeof(client->name) - 1, "cs53l32a");
 
-	cs53l32a_info("chip found @ 0x%x (%s)\n", address << 1, adapter->name);
+	v4l_info(client, "chip found @ 0x%x (%s)\n", address << 1, adapter->name);
 
 	for (i = 1; i <= 7; i++) {
 		u8 v = cs53l32a_read(client, i);
 
-		cs53l32a_dbg("Read Reg %d %02x\n", i, v);
+		v4l_dbg(1, client, "Read Reg %d %02x\n", i, v);
 	}
 
 	/* Set cs53l32a internal register for Adaptec 2010/2410 setup */
@@ -206,7 +192,7 @@ static int cs53l32a_attach(struct i2c_adapter *adapter, int address,
 	for (i = 1; i <= 7; i++) {
 		u8 v = cs53l32a_read(client, i);
 
-		cs53l32a_dbg("Read Reg %d %02x\n", i, v);
+		v4l_dbg(1, client, "Read Reg %d %02x\n", i, v);
 	}
 
 	i2c_attach_client(client);