Skip to content

Commit

Permalink
driver core: fix gcc 4.3.3 warnings about string literals
Browse files Browse the repository at this point in the history
This removes the
	warning: format not a string literal and no format arguments
warnings in the driver core that gcc 4.3.3 complains about.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Greg Kroah-Hartman committed Jun 16, 2009
1 parent d12b77a commit acc0e90
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions drivers/base/core.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion drivers/base/firmware_class.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion drivers/base/platform.c
Original file line number Diff line number Diff line change
Expand Up @@ -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];
Expand Down
2 changes: 1 addition & 1 deletion drivers/base/sys.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down

0 comments on commit acc0e90

Please sign in to comment.