Commit acc0e90fbccbc6e4d48184cba0983ea044e131af

Authored by Greg Kroah-Hartman
1 parent d12b77afb4

driver core: fix gcc 4.3.3 warnings about string literals

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>

Showing 4 changed files with 5 additions and 5 deletions Side-by-side Diff

... ... @@ -875,7 +875,7 @@
875 875 * the name, and force the use of dev_name()
876 876 */
877 877 if (dev->init_name) {
878   - dev_set_name(dev, dev->init_name);
  878 + dev_set_name(dev, "%s", dev->init_name);
879 879 dev->init_name = NULL;
880 880 }
881 881  
... ... @@ -1272,7 +1272,7 @@
1272 1272 if (!root)
1273 1273 return ERR_PTR(err);
1274 1274  
1275   - err = dev_set_name(&root->dev, name);
  1275 + err = dev_set_name(&root->dev, "%s", name);
1276 1276 if (err) {
1277 1277 kfree(root);
1278 1278 return ERR_PTR(err);
drivers/base/firmware_class.c
... ... @@ -399,7 +399,7 @@
399 399 fw_priv->timeout.data = (u_long) fw_priv;
400 400 init_timer(&fw_priv->timeout);
401 401  
402   - dev_set_name(f_dev, dev_name(device));
  402 + dev_set_name(f_dev, "%s", dev_name(device));
403 403 f_dev->parent = device;
404 404 f_dev->class = &firmware_class;
405 405 dev_set_drvdata(f_dev, fw_priv);
drivers/base/platform.c
... ... @@ -245,7 +245,7 @@
245 245 if (pdev->id != -1)
246 246 dev_set_name(&pdev->dev, "%s.%d", pdev->name, pdev->id);
247 247 else
248   - dev_set_name(&pdev->dev, pdev->name);
  248 + dev_set_name(&pdev->dev, "%s", pdev->name);
249 249  
250 250 for (i = 0; i < pdev->num_resources; i++) {
251 251 struct resource *p, *r = &pdev->resource[i];
... ... @@ -141,7 +141,7 @@
141 141 cls->kset.kobj.ktype = &ktype_sysdev_class;
142 142 cls->kset.kobj.kset = system_kset;
143 143  
144   - retval = kobject_set_name(&cls->kset.kobj, cls->name);
  144 + retval = kobject_set_name(&cls->kset.kobj, "%s", cls->name);
145 145 if (retval)
146 146 return retval;
147 147