V4L/DVB (9116): USB: remove info() macro from usb media drivers

[linux-2.6-omap-h63xx.git] / drivers / media / video / usbvision / usbvision-i2c.c

diff --git a/drivers/media/video/usbvision/usbvision-i2c.c b/drivers/media/video/usbvision/usbvision-i2c.c
index aabc42cae9c7be63b38b6fa3bc9f26b6f12570ba..92427fdc1459b2b62af94aabe79063a08dc335f3 100644 (file)
--- a/drivers/media/video/usbvision/usbvision-i2c.c
+++ b/drivers/media/video/usbvision/usbvision-i2c.c
@@ -40,13 +40,16 @@
 
 #define DBG_I2C                1<<0
 
-static int i2c_debug = 0;
+static int i2c_debug;
 
 module_param (i2c_debug, int, 0644);                   // debug_i2c_usb mode of the device driver
 MODULE_PARM_DESC(i2c_debug, "enable debug messages [i2c]");
 
-#define PDEBUG(level, fmt, args...) \
-               if (i2c_debug & (level)) info("[%s:%d] " fmt, __PRETTY_FUNCTION__, __LINE__ , ## args)
+#define PDEBUG(level, fmt, args...) { \
+               if (i2c_debug & (level)) \
+                       printk(KERN_INFO KBUILD_MODNAME ":[%s:%d] " fmt, \
+                               __func__, __LINE__ , ## args); \
+       }
 
 static int usbvision_i2c_write(struct usb_usbvision *usbvision, unsigned char addr, char *buf,
                            short len);
@@ -188,7 +191,6 @@ static u32 functionality(struct i2c_adapter *adap)
        return I2C_FUNC_SMBUS_EMUL | I2C_FUNC_10BIT_ADDR;
 }
 
-
 /* -----exported algorithm data: ------------------------------------- */
 
 static struct i2c_algorithm usbvision_algo = {
@@ -512,11 +514,7 @@ static struct i2c_adapter i2c_adap_template = {
        .id                = I2C_HW_B_BT848, /* FIXME */
        .client_register   = attach_inform,
        .client_unregister = detach_inform,
-#ifdef I2C_ADAP_CLASS_TV_ANALOG
-       .class             = I2C_ADAP_CLASS_TV_ANALOG,
-#else
        .class             = I2C_CLASS_TV_ANALOG,
-#endif
 };
 
 static struct i2c_client i2c_client_template = {