1 files changed, 4 insertions, 4 deletions

diff --git a/drivers/media/video/tvmixer.c b/drivers/media/video/tvmixer.c
index f0635b19de30..a43301a154af 100644
--- a/drivers/media/video/tvmixer.c
+++ b/drivers/media/video/tvmixer.c
@@ -91,7 +91,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 +100,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;
@@ -295,7 +295,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 +354,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);
                 }
         }
 }