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

[~andy/linux] / drivers / media / video / hexium_gemini.c

diff --git a/drivers/media/video/hexium_gemini.c b/drivers/media/video/hexium_gemini.c
index cbc505a2fc29cecf838ed92592db2e576fb021ec..a62322d5c0d87fd6346982acd9db4897c2e688f0 100644 (file)
--- a/drivers/media/video/hexium_gemini.c
+++ b/drivers/media/video/hexium_gemini.c
@@ -21,9 +21,12 @@
     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>
+#include <linux/module.h>
 
 static int debug;
 module_param(debug, int, 0);
@@ -175,13 +178,14 @@ 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_ks0127b); i++) {
                data.byte = hexium_ks0127b[i];
                if (0 != i2c_smbus_xfer(&hexium->i2c_adapter, 0x6c, 0, I2C_SMBUS_WRITE, i, I2C_SMBUS_BYTE_DATA, &data)) {
-                       printk("hexium_gemini: hexium_init_done() failed for address 0x%02x\n", i);
+                       pr_err("hexium_init_done() failed for address 0x%02x\n",
+                              i);
                }
        }
 
@@ -192,7 +196,7 @@ static int hexium_set_input(struct hexium *hexium, int input)
 {
        union i2c_smbus_data data;
 
-       DEB_D((".\n"));
+       DEB_D("\n");
 
        data.byte = hexium_input_select[input].byte;
        if (0 != i2c_smbus_xfer(&hexium->i2c_adapter, 0x6c, 0, I2C_SMBUS_WRITE, hexium_input_select[input].adr, I2C_SMBUS_BYTE_DATA, &data)) {
@@ -207,12 +211,13 @@ static int hexium_set_standard(struct hexium *hexium, struct hexium_data *vdec)
        union i2c_smbus_data data;
        int i = 0;
 
-       DEB_D((".\n"));
+       DEB_D("\n");
 
        while (vdec[i].adr != -1) {
                data.byte = vdec[i].byte;
                if (0 != i2c_smbus_xfer(&hexium->i2c_adapter, 0x6c, 0, I2C_SMBUS_WRITE, vdec[i].adr, I2C_SMBUS_BYTE_DATA, &data)) {
-                       printk("hexium_init_done: hexium_set_standard() failed for address 0x%02x\n", i);
+                       pr_err("hexium_init_done: hexium_set_standard() failed for address 0x%02x\n",
+                              i);
                        return -1;
                }
                i++;
@@ -222,14 +227,14 @@ static int hexium_set_standard(struct hexium *hexium, struct hexium_data *vdec)
 
 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;
 }
 
@@ -240,7 +245,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;
 }
 
@@ -249,7 +254,7 @@ static int vidioc_s_input(struct file *file, void *fh, unsigned int input)
        struct saa7146_dev *dev = ((struct saa7146_fh *)fh)->dev;
        struct hexium *hexium = (struct hexium *) dev->ext_priv;
 
-       DEB_EE(("VIDIOC_S_INPUT %d.\n", input));
+       DEB_EE("VIDIOC_S_INPUT %d\n", input);
 
        if (input >= HEXIUM_INPUTS)
                return -EINVAL;
@@ -270,7 +275,7 @@ static int vidioc_queryctrl(struct file *file, void *fh, struct v4l2_queryctrl *
        for (i = HEXIUM_CONTROLS - 1; i >= 0; i--) {
                if (hexium_controls[i].id == qc->id) {
                        *qc = hexium_controls[i];
-                       DEB_D(("VIDIOC_QUERYCTRL %d.\n", qc->id));
+                       DEB_D("VIDIOC_QUERYCTRL %d\n", qc->id);
                        return 0;
                }
        }
@@ -293,7 +298,7 @@ static int vidioc_g_ctrl(struct file *file, void *fh, struct v4l2_control *vc)
 
        if (vc->id == V4L2_CID_PRIVATE_BASE) {
                vc->value = hexium->cur_bw;
-               DEB_D(("VIDIOC_G_CTRL BW:%d.\n", vc->value));
+               DEB_D("VIDIOC_G_CTRL BW:%d\n", vc->value);
                return 0;
        }
        return -EINVAL;
@@ -316,7 +321,7 @@ static int vidioc_s_ctrl(struct file *file, void *fh, struct v4l2_control *vc)
        if (vc->id == V4L2_CID_PRIVATE_BASE)
                hexium->cur_bw = vc->value;
 
-       DEB_D(("VIDIOC_S_CTRL BW:%d.\n", hexium->cur_bw));
+       DEB_D("VIDIOC_S_CTRL BW:%d\n", hexium->cur_bw);
 
        if (0 == hexium->cur_bw && V4L2_STD_PAL == hexium->cur_std) {
                hexium_set_standard(hexium, hexium_pal);
@@ -351,14 +356,14 @@ static struct saa7146_ext_vv vv_data;
 /* this function only gets called when the probing was successful */
 static int hexium_attach(struct saa7146_dev *dev, struct saa7146_pci_extension_data *info)
 {
-       struct hexium *hexium = (struct hexium *) dev->ext_priv;
+       struct hexium *hexium;
        int ret;
 
-       DEB_EE((".\n"));
+       DEB_EE("\n");
 
        hexium = kzalloc(sizeof(struct hexium), GFP_KERNEL);
        if (NULL == hexium) {
-               printk("hexium_gemini: not enough kernel memory in hexium_attach().\n");
+               pr_err("not enough kernel memory in hexium_attach()\n");
                return -ENOMEM;
        }
        dev->ext_priv = hexium;
@@ -371,7 +376,7 @@ static int hexium_attach(struct saa7146_dev *dev, struct saa7146_pci_extension_d
        };
        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;
        }
@@ -402,11 +407,11 @@ static int hexium_attach(struct saa7146_dev *dev, struct saa7146_pci_extension_d
        vv_data.ops.vidioc_s_input = vidioc_s_input;
        ret = saa7146_register_device(&hexium->video_dev, dev, "hexium gemini", VFL_TYPE_GRABBER);
        if (ret < 0) {
-               printk("hexium_gemini: cannot register capture v4l2 device. skipping.\n");
+               pr_err("cannot register capture v4l2 device. skipping.\n");
                return ret;
        }
 
-       printk("hexium_gemini: found 'hexium gemini' frame grabber-%d.\n", hexium_num);
+       pr_info("found 'hexium gemini' frame grabber-%d\n", hexium_num);
        hexium_num++;
 
        return 0;
@@ -416,7 +421,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);
@@ -508,7 +513,7 @@ static struct saa7146_extension hexium_extension = {
 static int __init hexium_init_module(void)
 {
        if (0 != saa7146_register_extension(&hexium_extension)) {
-               DEB_S(("failed to register extension.\n"));
+               DEB_S("failed to register extension\n");
                return -ENODEV;
        }