aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean Delvare <khali@linux-fr.org>2009-09-25 08:15:59 -0400
committerSamuel Ortiz <sameo@linux.intel.com>2009-12-13 13:20:40 -0500
commit29f02646f0fa2b3c3a91f9145653e6a6ae8e7eb1 (patch)
tree80f9a44d3ed34217c7a82c9302ace4cb1873fa80
parent956266da703e3885924fe21bfc20f32d8f875474 (diff)
mfd: Don't abuse i2c_client.name
The name field of struct i2c_client is for i2c-core's use, it should never be changed by the drivers themselves. Signed-off-by: Jean Delvare <khali@linux-fr.org> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
-rw-r--r--drivers/mfd/ab3100-core.c3
-rw-r--r--drivers/mfd/twl4030-core.c2
2 files changed, 0 insertions, 5 deletions
diff --git a/drivers/mfd/ab3100-core.c b/drivers/mfd/ab3100-core.c
index 61348102827..fd42a80e7bf 100644
--- a/drivers/mfd/ab3100-core.c
+++ b/drivers/mfd/ab3100-core.c
@@ -900,9 +900,6 @@ static int __init ab3100_probe(struct i2c_client *client,
900 goto exit_no_testreg_client; 900 goto exit_no_testreg_client;
901 } 901 }
902 902
903 strlcpy(ab3100->testreg_client->name, id->name,
904 sizeof(ab3100->testreg_client->name));
905
906 err = ab3100_setup(ab3100); 903 err = ab3100_setup(ab3100);
907 if (err) 904 if (err)
908 goto exit_no_setup; 905 goto exit_no_setup;
diff --git a/drivers/mfd/twl4030-core.c b/drivers/mfd/twl4030-core.c
index 40449cdf09d..e3abbf66cc5 100644
--- a/drivers/mfd/twl4030-core.c
+++ b/drivers/mfd/twl4030-core.c
@@ -814,8 +814,6 @@ twl4030_probe(struct i2c_client *client, const struct i2c_device_id *id)
814 status = -ENOMEM; 814 status = -ENOMEM;
815 goto fail; 815 goto fail;
816 } 816 }
817 strlcpy(twl->client->name, id->name,
818 sizeof(twl->client->name));
819 } 817 }
820 mutex_init(&twl->xfer_lock); 818 mutex_init(&twl->xfer_lock);
821 } 819 }