drop i2c_clientname()

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

1 files changed, 12 insertions, 12 deletions

diff --git a/v4l_experimental/v3tv/vpx3224-proc.c b/v4l_experimental/v3tv/vpx3224-proc.c
index eaf9d12e7..c80b73c34 100644
--- a/v4l_experimental/v3tv/vpx3224-proc.c
+++ b/v4l_experimental/v3tv/vpx3224-proc.c
@@ -51,7 +51,7 @@ vpx3224_partnum(struct i2c_client *client, int operation, int ctl_name,
 	} else if (operation == SENSORS_PROC_REAL_WRITE) {
 		DEB(printk(KERN_INFO "%s: Warning: write was requested on "
 			   "read-only proc file: PartNumber\n",
-			   i2c_clientname(client)));
+			   client->name));
 	}
 }
 
@@ -101,14 +101,14 @@ vpx3224_sync_slicer(struct i2c_client *client, int operation, int ctl_name,
 			    (KERN_INFO
 			     "%s: Warning: write was requested on "
 			     "read-only register: " STR_fmt "0x%x: \n",
-			     i2c_clientname(client),
+			     client->name,
 			     VPX_LABEL(R_sync_stat) R_sync_stat));
 		if (*nrels_mag >= 3)
 			DEB(printk
 			    (KERN_INFO
 			     "%s: Warning: write was requested on "
 			     "read-only register: " STR_fmt "0x%x: \n",
-			     i2c_clientname(client),
+			     client->name,
 			     VPX_LABEL(R_sync_count) R_sync_count));
 	}
 }
@@ -155,14 +155,14 @@ vpx3224_bit_slicer(struct i2c_client *client, int operation, int ctl_name,
 			    (KERN_INFO
 			     "%s: Warning: write was requested on "
 			     "read-only register: " STR_fmt "0x%x: \n",
-			     i2c_clientname(client),
+			     client->name,
 			     VPX_LABEL(R_coeff_rd) R_coeff_rd));
 		if (*nrels_mag >= 8)
 			DEB(printk
 			    (KERN_INFO
 			     "%s: Warning: write was requested on "
 			     "read-only register: " STR_fmt "0x%x: \n",
-			     i2c_clientname(client),
+			     client->name,
 			     VPX_LABEL(R_level_rd) R_level_rd));
 	}
 }
@@ -289,7 +289,7 @@ static int vpx3224_dump_register(struct i2c_client *client, int arg)
 					 "Chip Identification: %s\n"
 					 "    Manufacturer ID: 0x%x\n"
 					 "        Part Number: 0x%x\n",
-					 i2c_clientname(client), jedec,
+					 client->name, jedec,
 					 pn);
 		}
 		break;
@@ -796,21 +796,21 @@ void vpx3224_init_proc(struct i2c_client *client)
 
 	/* Register a new directory entry with module sensors */
 	i = i2c_register_entry
-	    (client, i2c_clientname(client), vpx3224_dir_table_template);
+	    (client, client->name, vpx3224_dir_table_template);
 	if (i < 0)
 		printk(KERN_INFO "%s: could not register "
 		       "vpx3224_dir_table_template: err: %d\n",
-		       i2c_clientname(client), i);
+		       client->name, i);
 	else
 		decoder->sysctl_id = i;
 
 	proc_entry = create_proc_read_entry
-	    (i2c_clientname(client), 0, &proc_root, &vpx3224_read_regs,
+	    (client->name, 0, &proc_root, &vpx3224_read_regs,
 	     client);
 	if (!proc_entry)
 		printk(KERN_INFO "%s: could not create "
-		       "/proc/%s\n", i2c_clientname(client),
-		       i2c_clientname(client));
+		       "/proc/%s\n", client->name,
+		       client->name);
 }
 
 void vpx3224_del_proc(struct i2c_client *client)
@@ -819,5 +819,5 @@ void vpx3224_del_proc(struct i2c_client *client)
 			     sysctl_id);
 
 	if (proc_entry)
-		remove_proc_entry(i2c_clientname(client), &proc_root);
+		remove_proc_entry(client->name, &proc_root);
 }