V4L/DVB (3569): PATCH: switch cpia2 to mutexes and use ioctl 32 compat lib func

[linux-2.6] / drivers / media / video / tuner-3036.c

diff --git a/drivers/media/video/tuner-3036.c b/drivers/media/video/tuner-3036.c
index 51748c6578d1f83a97055bcb5417c1878eb6cb48..c4a78e7a5a58bf3206ccae4f69ee9d7ba3d98580 100644 (file)
--- a/drivers/media/video/tuner-3036.c
+++ b/drivers/media/video/tuner-3036.c
@@ -41,7 +41,6 @@ static struct i2c_client_address_data addr_data = {
        .normal_i2c     = normal_i2c,
        .probe          = &ignore,
        .ignore         = &ignore,
-       .force          = &ignore,
 };
 
 /* ---------------------------------------------------------------------- */
@@ -152,7 +151,7 @@ tuner_command(struct i2c_client *client, unsigned int cmd, void *arg)
 
        switch (cmd) 
        {
-               case TUNER_SET_TVFREQ:
+               case VIDIOCSFREQ:
                        set_tv_freq(client, *iarg);
                        break;
            
@@ -166,7 +165,7 @@ static int
 tuner_probe(struct i2c_adapter *adap)
 {
        this_adap = 0;
-       if (adap->id == (I2C_ALGO_BIT | I2C_HW_B_LP))
+       if (adap->id == I2C_HW_B_LP)
                return i2c_probe(adap, &addr_data, tuner_attach);
        return 0;
 }
@@ -176,10 +175,10 @@ tuner_probe(struct i2c_adapter *adap)
 static struct i2c_driver 
 i2c_driver_tuner = 
 {
-       .owner          =       THIS_MODULE,
-       .name           =       "sab3036",
+       .driver = {
+               .name   =       "sab3036",
+       },
        .id             =       I2C_DRIVERID_SAB3036,
-        .flags         =       I2C_DF_NOTIFY,
        .attach_adapter =       tuner_probe,
        .detach_client  =       tuner_detach,
        .command        =       tuner_command
@@ -194,8 +193,7 @@ static struct i2c_client client_template =
 static int __init
 tuner3036_init(void)
 {
-       i2c_add_driver(&i2c_driver_tuner);
-       return 0;
+       return i2c_add_driver(&i2c_driver_tuner);
 }
 
 static void __exit