Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git...

[pandora-kernel.git] / drivers / media / video / hexium_orion.c

diff --git a/drivers/media/video/hexium_orion.c b/drivers/media/video/hexium_orion.c
index 62a5c8b..23debc9 100644 (file)
--- a/drivers/media/video/hexium_orion.c
+++ b/drivers/media/video/hexium_orion.c
@@ -21,6 +21,8 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #define DEBUG_VARIABLE debug
 
 #include <media/saa7146_vv.h>
@@ -210,7 +212,7 @@ static int hexium_probe(struct saa7146_dev *dev)
        union i2c_smbus_data data;
        int err = 0;
 
-       DEB_EE((".\n"));
+       DEB_EE("\n");
 
        /* there are no hexium orion cards with revision 0 saa7146s */
        if (0 == dev->revision) {
@@ -219,7 +221,7 @@ static int hexium_probe(struct saa7146_dev *dev)
 
        hexium = kzalloc(sizeof(struct hexium), GFP_KERNEL);
        if (NULL == hexium) {
-               printk("hexium_orion: hexium_probe: not enough kernel memory.\n");
+               pr_err("hexium_probe: not enough kernel memory\n");
                return -ENOMEM;
        }
 
@@ -235,7 +237,7 @@ static int hexium_probe(struct saa7146_dev *dev)
        };
        saa7146_i2c_adapter_prepare(dev, &hexium->i2c_adapter, SAA7146_I2C_BUS_BIT_RATE_480);
        if (i2c_add_adapter(&hexium->i2c_adapter) < 0) {
-               DEB_S(("cannot register i2c-device. skipping.\n"));
+               DEB_S("cannot register i2c-device. skipping.\n");
                kfree(hexium);
                return -EFAULT;
        }
@@ -249,7 +251,7 @@ static int hexium_probe(struct saa7146_dev *dev)
 
        /* detect newer Hexium Orion cards by subsystem ids */
        if (0x17c8 == dev->pci->subsystem_vendor && 0x0101 == dev->pci->subsystem_device) {
-               printk("hexium_orion: device is a Hexium Orion w/ 1 SVHS + 3 BNC inputs.\n");
+               pr_info("device is a Hexium Orion w/ 1 SVHS + 3 BNC inputs\n");
                /* we store the pointer in our private data field */
                dev->ext_priv = hexium;
                hexium->type = HEXIUM_ORION_1SVHS_3BNC;
@@ -257,7 +259,7 @@ static int hexium_probe(struct saa7146_dev *dev)
        }
 
        if (0x17c8 == dev->pci->subsystem_vendor && 0x2101 == dev->pci->subsystem_device) {
-               printk("hexium_orion: device is a Hexium Orion w/ 4 BNC inputs.\n");
+               pr_info("device is a Hexium Orion w/ 4 BNC inputs\n");
                /* we store the pointer in our private data field */
                dev->ext_priv = hexium;
                hexium->type = HEXIUM_ORION_4BNC;
@@ -267,7 +269,7 @@ static int hexium_probe(struct saa7146_dev *dev)
        /* check if this is an old hexium Orion card by looking at
           a saa7110 at address 0x4e */
        if (0 == (err = i2c_smbus_xfer(&hexium->i2c_adapter, 0x4e, 0, I2C_SMBUS_READ, 0x00, I2C_SMBUS_BYTE_DATA, &data))) {
-               printk("hexium_orion: device is a Hexium HV-PCI6/Orion (old).\n");
+               pr_info("device is a Hexium HV-PCI6/Orion (old)\n");
                /* we store the pointer in our private data field */
                dev->ext_priv = hexium;
                hexium->type = HEXIUM_HV_PCI6_ORION;
@@ -289,13 +291,13 @@ static int hexium_init_done(struct saa7146_dev *dev)
        union i2c_smbus_data data;
        int i = 0;
 
-       DEB_D(("hexium_init_done called.\n"));
+       DEB_D("hexium_init_done called\n");
 
        /* initialize the helper ics to useful values */
        for (i = 0; i < sizeof(hexium_saa7110); i++) {
                data.byte = hexium_saa7110[i];
                if (0 != i2c_smbus_xfer(&hexium->i2c_adapter, 0x4e, 0, I2C_SMBUS_WRITE, i, I2C_SMBUS_BYTE_DATA, &data)) {
-                       printk("hexium_orion: failed for address 0x%02x\n", i);
+                       pr_err("failed for address 0x%02x\n", i);
                }
        }
 
@@ -307,7 +309,7 @@ static int hexium_set_input(struct hexium *hexium, int input)
        union i2c_smbus_data data;
        int i = 0;
 
-       DEB_D((".\n"));
+       DEB_D("\n");
 
        for (i = 0; i < 8; i++) {
                int adr = hexium_input_select[input].data[i].adr;
@@ -315,7 +317,7 @@ static int hexium_set_input(struct hexium *hexium, int input)
                if (0 != i2c_smbus_xfer(&hexium->i2c_adapter, 0x4e, 0, I2C_SMBUS_WRITE, adr, I2C_SMBUS_BYTE_DATA, &data)) {
                        return -1;
                }
-               printk("%d: 0x%02x => 0x%02x\n",input, adr,data.byte);
+               pr_debug("%d: 0x%02x => 0x%02x\n", input, adr, data.byte);
        }
 
        return 0;
@@ -323,14 +325,14 @@ static int hexium_set_input(struct hexium *hexium, int input)
 
 static int vidioc_enum_input(struct file *file, void *fh, struct v4l2_input *i)
 {
-       DEB_EE(("VIDIOC_ENUMINPUT %d.\n", i->index));
+       DEB_EE("VIDIOC_ENUMINPUT %d\n", i->index);
 
        if (i->index >= HEXIUM_INPUTS)
                return -EINVAL;
 
        memcpy(i, &hexium_inputs[i->index], sizeof(struct v4l2_input));
 
-       DEB_D(("v4l2_ioctl: VIDIOC_ENUMINPUT %d.\n", i->index));
+       DEB_D("v4l2_ioctl: VIDIOC_ENUMINPUT %d\n", i->index);
        return 0;
 }
 
@@ -341,7 +343,7 @@ static int vidioc_g_input(struct file *file, void *fh, unsigned int *input)
 
        *input = hexium->cur_input;
 
-       DEB_D(("VIDIOC_G_INPUT: %d\n", *input));
+       DEB_D("VIDIOC_G_INPUT: %d\n", *input);
        return 0;
 }
 
@@ -366,18 +368,18 @@ static int hexium_attach(struct saa7146_dev *dev, struct saa7146_pci_extension_d
 {
        struct hexium *hexium = (struct hexium *) dev->ext_priv;
 
-       DEB_EE((".\n"));
+       DEB_EE("\n");
 
        saa7146_vv_init(dev, &vv_data);
        vv_data.ops.vidioc_enum_input = vidioc_enum_input;
        vv_data.ops.vidioc_g_input = vidioc_g_input;
        vv_data.ops.vidioc_s_input = vidioc_s_input;
        if (0 != saa7146_register_device(&hexium->video_dev, dev, "hexium orion", VFL_TYPE_GRABBER)) {
-               printk("hexium_orion: cannot register capture v4l2 device. skipping.\n");
+               pr_err("cannot register capture v4l2 device. skipping.\n");
                return -1;
        }
 
-       printk("hexium_orion: found 'hexium orion' frame grabber-%d.\n", hexium_num);
+       pr_err("found 'hexium orion' frame grabber-%d\n", hexium_num);
        hexium_num++;
 
        /* the rest */
@@ -391,7 +393,7 @@ static int hexium_detach(struct saa7146_dev *dev)
 {
        struct hexium *hexium = (struct hexium *) dev->ext_priv;
 
-       DEB_EE(("dev:%p\n", dev));
+       DEB_EE("dev:%p\n", dev);
 
        saa7146_unregister_device(&hexium->video_dev, dev);
        saa7146_vv_release(dev);
@@ -480,7 +482,7 @@ static struct saa7146_extension extension = {
 static int __init hexium_init_module(void)
 {
        if (0 != saa7146_register_extension(&extension)) {
-               DEB_S(("failed to register extension.\n"));
+               DEB_S("failed to register extension\n");
                return -ENODEV;
        }