include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit...

[safe/jmp/linux-2.6] / drivers / media / video / cx88 / cx88-vp3054-i2c.c

diff --git a/drivers/media/video/cx88/cx88-vp3054-i2c.c b/drivers/media/video/cx88/cx88-vp3054-i2c.c
index 372cd29..794f293 100644 (file)
--- a/drivers/media/video/cx88/cx88-vp3054-i2c.c
+++ b/drivers/media/video/cx88/cx88-vp3054-i2c.c
@@ -23,7 +23,7 @@
 */
 
 #include <linux/module.h>
-#include <linux/moduleparam.h>
+#include <linux/slab.h>
 #include <linux/init.h>
 
 #include <asm/io.h>
@@ -31,6 +31,9 @@
 #include "cx88.h"
 #include "cx88-vp3054-i2c.h"
 
+MODULE_DESCRIPTION("driver for cx2388x VP3054 design");
+MODULE_AUTHOR("Chris Pascoe <c.pascoe@itee.uq.edu.au>");
+MODULE_LICENSE("GPL");
 
 /* ----------------------------------------------------------------------- */
 
@@ -38,7 +41,7 @@ static void vp3054_bit_setscl(void *data, int state)
 {
        struct cx8802_dev *dev = data;
        struct cx88_core *core = dev->core;
-       struct vp3054_i2c_state *vp3054_i2c = dev->card_priv;
+       struct vp3054_i2c_state *vp3054_i2c = dev->vp3054;
 
        if (state) {
                vp3054_i2c->state |=  0x0001;   /* SCL high */
@@ -55,7 +58,7 @@ static void vp3054_bit_setsda(void *data, int state)
 {
        struct cx8802_dev *dev = data;
        struct cx88_core *core = dev->core;
-       struct vp3054_i2c_state *vp3054_i2c = dev->card_priv;
+       struct vp3054_i2c_state *vp3054_i2c = dev->vp3054;
 
        if (state) {
                vp3054_i2c->state |=  0x0002;   /* SDA high */
@@ -90,58 +93,44 @@ static int vp3054_bit_getsda(void *data)
 
 /* ----------------------------------------------------------------------- */
 
-static struct i2c_algo_bit_data vp3054_i2c_algo_template = {
+static const struct i2c_algo_bit_data vp3054_i2c_algo_template = {
        .setsda  = vp3054_bit_setsda,
        .setscl  = vp3054_bit_setscl,
        .getsda  = vp3054_bit_getsda,
        .getscl  = vp3054_bit_getscl,
        .udelay  = 16,
-       .mdelay  = 10,
        .timeout = 200,
 };
 
 /* ----------------------------------------------------------------------- */
 
-static struct i2c_adapter vp3054_i2c_adap_template = {
-       .name              = "cx2388x",
-       .owner             = THIS_MODULE,
-       .id                = I2C_HW_B_CX2388x,
-};
-
-static struct i2c_client vp3054_i2c_client_template = {
-       .name   = "VP-3054",
-};
-
 int vp3054_i2c_probe(struct cx8802_dev *dev)
 {
        struct cx88_core *core = dev->core;
        struct vp3054_i2c_state *vp3054_i2c;
        int rc;
 
-       if (core->board != CX88_BOARD_DNTV_LIVE_DVB_T_PRO)
+       if (core->boardnr != CX88_BOARD_DNTV_LIVE_DVB_T_PRO)
                return 0;
 
-       dev->card_priv = kzalloc(sizeof(*vp3054_i2c), GFP_KERNEL);
-       if (dev->card_priv == NULL)
+       vp3054_i2c = kzalloc(sizeof(*vp3054_i2c), GFP_KERNEL);
+       if (vp3054_i2c == NULL)
                return -ENOMEM;
-       vp3054_i2c = dev->card_priv;
+       dev->vp3054 = vp3054_i2c;
 
-       memcpy(&vp3054_i2c->adap, &vp3054_i2c_adap_template,
-              sizeof(vp3054_i2c->adap));
        memcpy(&vp3054_i2c->algo, &vp3054_i2c_algo_template,
               sizeof(vp3054_i2c->algo));
-       memcpy(&vp3054_i2c->client, &vp3054_i2c_client_template,
-              sizeof(vp3054_i2c->client));
 
        vp3054_i2c->adap.class |= I2C_CLASS_TV_DIGITAL;
 
        vp3054_i2c->adap.dev.parent = &dev->pci->dev;
        strlcpy(vp3054_i2c->adap.name, core->name,
                sizeof(vp3054_i2c->adap.name));
+       vp3054_i2c->adap.owner = THIS_MODULE;
+       vp3054_i2c->adap.id = I2C_HW_B_CX2388x;
        vp3054_i2c->algo.data = dev;
        i2c_set_adapdata(&vp3054_i2c->adap, dev);
        vp3054_i2c->adap.algo_data = &vp3054_i2c->algo;
-       vp3054_i2c->client.adapter = &vp3054_i2c->adap;
 
        vp3054_bit_setscl(dev,1);
        vp3054_bit_setsda(dev,1);
@@ -150,8 +139,8 @@ int vp3054_i2c_probe(struct cx8802_dev *dev)
        if (0 != rc) {
                printk("%s: vp3054_i2c register FAILED\n", core->name);
 
-               kfree(dev->card_priv);
-               dev->card_priv = NULL;
+               kfree(dev->vp3054);
+               dev->vp3054 = NULL;
        }
 
        return rc;
@@ -159,13 +148,13 @@ int vp3054_i2c_probe(struct cx8802_dev *dev)
 
 void vp3054_i2c_remove(struct cx8802_dev *dev)
 {
-       struct vp3054_i2c_state *vp3054_i2c = dev->card_priv;
+       struct vp3054_i2c_state *vp3054_i2c = dev->vp3054;
 
        if (vp3054_i2c == NULL ||
-           dev->core->board != CX88_BOARD_DNTV_LIVE_DVB_T_PRO)
+           dev->core->boardnr != CX88_BOARD_DNTV_LIVE_DVB_T_PRO)
                return;
 
-       i2c_bit_del_bus(&vp3054_i2c->adap);
+       i2c_del_adapter(&vp3054_i2c->adap);
        kfree(vp3054_i2c);
 }