X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fmedia%2Fvideo%2Ftuner-3036.c;h=74ab48c09c6a448a745f3469ae08cdc9c1adf373;hb=43bc926fffd92024b46cafaf7350d669ba9ca884;hp=6b20aa902a8f69b41422feee7982aa84f72e20bc;hpb=cee37fe97739d85991964371c1f3a745c00dd236;p=linux-2.6.git

diff --git a/drivers/media/video/tuner-3036.c b/drivers/media/video/tuner-3036.c
index 6b20aa902..74ab48c09 100644
--- a/drivers/media/video/tuner-3036.c
+++ b/drivers/media/video/tuner-3036.c
@@ -5,7 +5,7 @@
  *
  * The SAB3036 is just about different enough from the chips that
  * tuner.c copes with to make it not worth the effort to crowbar
- * the support into that file.  So instead we have a separate driver. 
+ * the support into that file.  So instead we have a separate driver.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -34,19 +34,13 @@ static int this_adap;
 static struct i2c_client client_template;
 
 /* Addresses to scan */
-static unsigned short normal_i2c[] = {I2C_CLIENT_END};
-static unsigned short normal_i2c_range[] = {0x60, 0x61, I2C_CLIENT_END};
-static unsigned short probe[2]        = { I2C_CLIENT_END, I2C_CLIENT_END };
-static unsigned short probe_range[2]  = { I2C_CLIENT_END, I2C_CLIENT_END };
-static unsigned short ignore[2]       = { I2C_CLIENT_END, I2C_CLIENT_END };
-static unsigned short ignore_range[2] = { I2C_CLIENT_END, I2C_CLIENT_END };
-static unsigned short force[2]        = { I2C_CLIENT_END, I2C_CLIENT_END };
+static unsigned short normal_i2c[] = { 0x60, 0x61, I2C_CLIENT_END };
+static unsigned short ignore = I2C_CLIENT_END;
 
 static struct i2c_client_address_data addr_data = {
-	normal_i2c, normal_i2c_range, 
-	probe, probe_range, 
-	ignore, ignore_range, 
-	force
+	.normal_i2c	= normal_i2c,
+	.probe		= &ignore,
+	.ignore		= &ignore,
 };
 
 /* ---------------------------------------------------------------------- */
@@ -62,15 +56,15 @@ tuner_getstatus (struct i2c_client *c)
 
 #define TUNER_FL        0x80
 
-static int 
+static int
 tuner_islocked (struct i2c_client *c)
 {
-        return (tuner_getstatus(c) & TUNER_FL);
+	return (tuner_getstatus(c) & TUNER_FL);
 }
 
 /* ---------------------------------------------------------------------- */
 
-static void 
+static void
 set_tv_freq(struct i2c_client *c, int freq)
 {
 	u16 div = ((freq * 20) / 16);
@@ -79,26 +73,26 @@ set_tv_freq(struct i2c_client *c, int freq)
 
 	if (debug)
 		printk(KERN_DEBUG "tuner: setting frequency %dMHz, divisor %x\n", freq / 16, div);
-	
+
 	/* Select high tuning current */
 	buffer[0] = 0x29;
 	buffer[1] = 0x3e;
 
 	if (i2c_master_send(c, buffer, 2) != 2)
 		printk("tuner: i2c i/o error 1\n");
-	
+
 	buffer[0] = 0x80 | ((div>>8) & 0x7f);
 	buffer[1] = div & 0xff;
 
 	if (i2c_master_send(c, buffer, 2) != 2)
 		printk("tuner: i2c i/o error 2\n");
-	
+
 	while (!tuner_islocked(c) && time_before(jiffies, give_up))
 		schedule();
-	       
+
 	if (!tuner_islocked(c))
 		printk(KERN_WARNING "tuner: failed to achieve PLL lock\n");
-	
+
 	/* Select low tuning current and engage AFC */
 	buffer[0] = 0x29;
 	buffer[1] = 0xb2;
@@ -112,7 +106,7 @@ set_tv_freq(struct i2c_client *c, int freq)
 
 /* ---------------------------------------------------------------------- */
 
-static int 
+static int
 tuner_attach(struct i2c_adapter *adap, int addr, int kind)
 {
 	static unsigned char buffer[] = { 0x29, 0x32, 0x2a, 0, 0x2b, 0 };
@@ -122,18 +116,18 @@ tuner_attach(struct i2c_adapter *adap, int addr, int kind)
 	if (this_adap > 0)
 		return -1;
 	this_adap++;
-	
-        client_template.adapter = adap;
-        client_template.addr = addr;
+
+	client_template.adapter = adap;
+	client_template.addr = addr;
 
 	client = kmalloc(sizeof(struct i2c_client), GFP_KERNEL);
-        if (client == NULL)
-                return -ENOMEM;
-        memcpy(client, &client_template, sizeof(struct i2c_client));
+	if (client == NULL)
+		return -ENOMEM;
+	memcpy(client, &client_template, sizeof(struct i2c_client));
 
 	printk("tuner: SAB3036 found, status %02x\n", tuner_getstatus(client));
 
-        i2c_attach_client(client);
+	i2c_attach_client(client);
 
 	if (i2c_master_send(client, buffer, 2) != 2)
 		printk("tuner: i2c i/o error 1\n");
@@ -144,47 +138,47 @@ tuner_attach(struct i2c_adapter *adap, int addr, int kind)
 	return 0;
 }
 
-static int 
+static int
 tuner_detach(struct i2c_client *c)
 {
 	return 0;
 }
 
-static int 
+static int
 tuner_command(struct i2c_client *client, unsigned int cmd, void *arg)
 {
 	int *iarg = (int*)arg;
 
-	switch (cmd) 
+	switch (cmd)
 	{
-		case TUNER_SET_TVFREQ:
+		case VIDIOCSFREQ:
 			set_tv_freq(client, *iarg);
 			break;
-	    
+
 		default:
 			return -EINVAL;
 	}
 	return 0;
 }
 
-static int 
+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;
 }
 
 /* ----------------------------------------------------------------------- */
 
-static struct i2c_driver 
-i2c_driver_tuner = 
+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
@@ -192,15 +186,14 @@ i2c_driver_tuner =
 
 static struct i2c_client client_template =
 {
-        .driver		= &i2c_driver_tuner,
+	.driver		= &i2c_driver_tuner,
 	.name		= "SAB3036",
 };
 
 static int __init
 tuner3036_init(void)
 {
-	i2c_add_driver(&i2c_driver_tuner);
-	return 0;
+	return i2c_add_driver(&i2c_driver_tuner);
 }
 
 static void __exit