From a890450da384ea77eef003179a6546ee31797b15 Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Tue, 2 Jun 2009 15:39:55 -0700
Subject: [PATCH] --- yaml --- r: 151254 b: refs/heads/master c:
 acc0e90fbccbc6e4d48184cba0983ea044e131af h: refs/heads/master v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/base/core.c           | 4 ++--
 trunk/drivers/base/firmware_class.c | 2 +-
 trunk/drivers/base/platform.c       | 2 +-
 trunk/drivers/base/sys.c            | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index eaab5ecaad2d..0d547fea3cef 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d12b77afb4f0a06e9c7e82a0e88d5f011b862c10
+refs/heads/master: acc0e90fbccbc6e4d48184cba0983ea044e131af
diff --git a/trunk/drivers/base/core.c b/trunk/drivers/base/core.c
index 7e8576d7822d..4d59975c24a8 100644
--- a/trunk/drivers/base/core.c
+++ b/trunk/drivers/base/core.c
@@ -875,7 +875,7 @@ int device_add(struct device *dev)
 	 * the name, and force the use of dev_name()
 	 */
 	if (dev->init_name) {
-		dev_set_name(dev, dev->init_name);
+		dev_set_name(dev, "%s", dev->init_name);
 		dev->init_name = NULL;
 	}
 
@@ -1272,7 +1272,7 @@ struct device *__root_device_register(const char *name, struct module *owner)
 	if (!root)
 		return ERR_PTR(err);
 
-	err = dev_set_name(&root->dev, name);
+	err = dev_set_name(&root->dev, "%s", name);
 	if (err) {
 		kfree(root);
 		return ERR_PTR(err);
diff --git a/trunk/drivers/base/firmware_class.c b/trunk/drivers/base/firmware_class.c
index 3591ba7ff6f7..ddeb819c8f87 100644
--- a/trunk/drivers/base/firmware_class.c
+++ b/trunk/drivers/base/firmware_class.c
@@ -399,7 +399,7 @@ static int fw_register_device(struct device **dev_p, const char *fw_name,
 	fw_priv->timeout.data = (u_long) fw_priv;
 	init_timer(&fw_priv->timeout);
 
-	dev_set_name(f_dev, dev_name(device));
+	dev_set_name(f_dev, "%s", dev_name(device));
 	f_dev->parent = device;
 	f_dev->class = &firmware_class;
 	dev_set_drvdata(f_dev, fw_priv);
diff --git a/trunk/drivers/base/platform.c b/trunk/drivers/base/platform.c
index 59df6290951b..81cb01bfc356 100644
--- a/trunk/drivers/base/platform.c
+++ b/trunk/drivers/base/platform.c
@@ -245,7 +245,7 @@ int platform_device_add(struct platform_device *pdev)
 	if (pdev->id != -1)
 		dev_set_name(&pdev->dev, "%s.%d", pdev->name,  pdev->id);
 	else
-		dev_set_name(&pdev->dev, pdev->name);
+		dev_set_name(&pdev->dev, "%s", pdev->name);
 
 	for (i = 0; i < pdev->num_resources; i++) {
 		struct resource *p, *r = &pdev->resource[i];
diff --git a/trunk/drivers/base/sys.c b/trunk/drivers/base/sys.c
index 162355cd745a..79a9ae5238ac 100644
--- a/trunk/drivers/base/sys.c
+++ b/trunk/drivers/base/sys.c
@@ -141,7 +141,7 @@ int sysdev_class_register(struct sysdev_class *cls)
 	cls->kset.kobj.ktype = &ktype_sysdev_class;
 	cls->kset.kobj.kset = system_kset;
 
-	retval = kobject_set_name(&cls->kset.kobj, cls->name);
+	retval = kobject_set_name(&cls->kset.kobj, "%s", cls->name);
 	if (retval)
 		return retval;