Merge /spare/repo/linux-2.6/

[linux-2.6-omap-h63xx.git] / drivers / media / video / tvmixer.c

diff --git a/drivers/media/video/tvmixer.c b/drivers/media/video/tvmixer.c
index 51b99cdbf29e8bc9447dc65eea4b53d7f230e2ae..d86e08ebddfc253506389050d3ef468dcbf3d532 100644 (file)
--- a/drivers/media/video/tvmixer.c
+++ b/drivers/media/video/tvmixer.c
@@ -1,5 +1,4 @@
 /*
- * $Id: tvmixer.c,v 1.8 2005/06/12 04:19:19 mchehab Exp $
  */
 
 #include <linux/module.h>
@@ -91,7 +90,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;
@@ -100,7 +99,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;
@@ -276,9 +275,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:
@@ -295,7 +294,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;
                }
        }
@@ -354,7 +353,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);
                }
        }
 }