From e09395ddc68f23ce35bcfc696bacf98d54a5d6a7 Mon Sep 17 00:00:00 2001
From: Jean Delvare <khali@linux-fr.org>
Date: Fri, 25 Sep 2009 14:15:59 +0200
Subject: [PATCH] --- yaml --- r: 176019 b: refs/heads/master c:
 29f02646f0fa2b3c3a91f9145653e6a6ae8e7eb1 h: refs/heads/master i:   176017:
 dcfc5b9bbd870bbba5a0d3f715be8a4acf86366e   176015:
 d18cc5e3eb1cab3a06120b62521ddf273075ab21 v: v3

---
 [refs]                           | 2 +-
 trunk/drivers/mfd/ab3100-core.c  | 3 ---
 trunk/drivers/mfd/twl4030-core.c | 2 --
 3 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 01a8656676bf..c65279839d3e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 956266da703e3885924fe21bfc20f32d8f875474
+refs/heads/master: 29f02646f0fa2b3c3a91f9145653e6a6ae8e7eb1
diff --git a/trunk/drivers/mfd/ab3100-core.c b/trunk/drivers/mfd/ab3100-core.c
index 613481028272..fd42a80e7bf9 100644
--- a/trunk/drivers/mfd/ab3100-core.c
+++ b/trunk/drivers/mfd/ab3100-core.c
@@ -900,9 +900,6 @@ static int __init ab3100_probe(struct i2c_client *client,
 		goto exit_no_testreg_client;
 	}
 
-	strlcpy(ab3100->testreg_client->name, id->name,
-		sizeof(ab3100->testreg_client->name));
-
 	err = ab3100_setup(ab3100);
 	if (err)
 		goto exit_no_setup;
diff --git a/trunk/drivers/mfd/twl4030-core.c b/trunk/drivers/mfd/twl4030-core.c
index 40449cdf09db..e3abbf66cc5c 100644
--- a/trunk/drivers/mfd/twl4030-core.c
+++ b/trunk/drivers/mfd/twl4030-core.c
@@ -814,8 +814,6 @@ twl4030_probe(struct i2c_client *client, const struct i2c_device_id *id)
 				status = -ENOMEM;
 				goto fail;
 			}
-			strlcpy(twl->client->name, id->name,
-					sizeof(twl->client->name));
 		}
 		mutex_init(&twl->xfer_lock);
 	}