* bt832.c: (bt832_probe):

        * bttv-i2c.c: (attach_inform):
        * cx88-i2c.c: (attach_inform), (detach_inform):
        * id.h:
        * ir-kbd-i2c.c: (ir_probe):
        * msp3400.c: (msp34xx_sleep), (msp_attach):
        * saa6588.c:
        * saa6752hs.c:
        * saa7134-i2c.c: (attach_inform):
        * saa7134-tvaudio.c: (tvaudio_sleep):
        * tda7432.c: (tda7432_probe):
        * tda9875.c: (tda9875_probe):
        * tda9887.c: (tda9887_probe):
        * tuner-core.c:
        * tveeprom.c: (tveeprom_attach_adapter):
        * tvmixer.c: (tvmixer_ioctl), (tvmixer_clients),
        (tvmixer_cleanup_module):
        * video-buf.c: (videobuf_dma_free):
        - Step two, in preparation for 2.6.14-rcX compatability:
        - Compile tested against vanila kernels 2.6.13 & 2.6.8
        - 2.6.14 compile still broken...

        Signed-off-by: Michael Krufky <mkrufky@m1k.net>

1 files changed, 8 insertions, 8 deletions

diff --git a/linux/drivers/media/video/tvmixer.c b/linux/drivers/media/video/tvmixer.c
index 25402dcca..4fac79b76 100644
--- a/linux/drivers/media/video/tvmixer.c
+++ b/linux/drivers/media/video/tvmixer.c
@@ -1,5 +1,5 @@
 /*
- * $Id: tvmixer.c,v 1.9 2005/07/15 21:44:14 mchehab Exp $
+ * $Id: tvmixer.c,v 1.10 2005/09/13 20:11:39 mkrufky Exp $
  */
 
 #include <linux/module.h>
@@ -102,7 +102,7 @@ static int tvmixer_ioctl(struct inode *inode, struct file *file, unsigned int cm
         if (cmd == SOUND_MIXER_INFO) {
                 mixer_info info;
                 strlcpy(info.id, "tv card", sizeof(info.id));
-                strlcpy(info.name, i2c_clientname(client), sizeof(info.name));
+                strlcpy(info.name, client->name, sizeof(info.name));
                 info.modify_counter = 42 /* FIXME */;
                 if (copy_to_user(argp, &info, sizeof(info)))
                         return -EFAULT;
@@ -111,7 +111,7 @@ static int tvmixer_ioctl(struct inode *inode, struct file *file, unsigned int cm
         if (cmd == SOUND_OLD_MIXER_INFO) {
                 _old_mixer_info info;
                 strlcpy(info.id, "tv card", sizeof(info.id));
-                strlcpy(info.name, i2c_clientname(client), sizeof(info.name));
+                strlcpy(info.name, client->name, sizeof(info.name));
                 if (copy_to_user(argp, &info, sizeof(info)))
                         return -EFAULT;
                 return 0;
@@ -301,9 +301,9 @@ static int tvmixer_clients(struct i2c_client *client)
 #else
 	/* TV card ??? */
 	switch (client->adapter->id) {
-	case I2C_ALGO_BIT | I2C_HW_SMBUS_VOODOO3:
-	case I2C_ALGO_BIT | I2C_HW_B_BT848:
-	case I2C_ALGO_BIT | I2C_HW_B_RIVA:
+	case I2C_HW_SMBUS_VOODOO3:
+	case I2C_HW_B_BT848:
+	case I2C_HW_B_RIVA:
 		/* ok, have a look ... */
 		break;
 	default:
@@ -320,7 +320,7 @@ static int tvmixer_clients(struct i2c_client *client)
 			devices[i].dev = NULL;
 			devices[i].minor = -1;
 			printk("tvmixer: %s unregistered (#1)\n",
-			       i2c_clientname(client));
+			       client->name);
 			return 0;
 		}
 	}
@@ -379,7 +379,7 @@ static void __exit tvmixer_cleanup_module(void)
 		if (devices[i].minor != -1) {
 			unregister_sound_mixer(devices[i].minor);
 			printk("tvmixer: %s unregistered (#2)\n",
-			       i2c_clientname(devices[i].dev));
+			       devices[i].dev->name);
 		}
 	}
 }