Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit acc0e90f authored Jun 02, 2009 by Greg Kroah-Hartman

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>

parent d12b77af

drivers/base/core.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -875,7 +875,7 @@ int device_add(struct device *dev)
	* the name, and force the use of dev_name()		* the name, and force the use of dev_name()
	*/		*/
	if (dev->init_name) {		if (dev->init_name) {
	dev_set_name(dev, dev->init_name);		dev_set_name(dev, "%s", dev->init_name);
	dev->init_name = NULL;		dev->init_name = NULL;
	}		}

	@@ -1272,7 +1272,7 @@ struct device __root_device_register(const char name, struct module *owner)
	if (!root)		if (!root)
	return ERR_PTR(err);		return ERR_PTR(err);

	err = dev_set_name(&root->dev, name);		err = dev_set_name(&root->dev, "%s", name);
	if (err) {		if (err) {
	kfree(root);		kfree(root);
	return ERR_PTR(err);		return ERR_PTR(err);

drivers/base/firmware_class.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -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;		fw_priv->timeout.data = (u_long) fw_priv;
	init_timer(&fw_priv->timeout);		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->parent = device;
	f_dev->class = &firmware_class;		f_dev->class = &firmware_class;
	dev_set_drvdata(f_dev, fw_priv);		dev_set_drvdata(f_dev, fw_priv);

drivers/base/platform.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -245,7 +245,7 @@ int platform_device_add(struct platform_device *pdev)
	if (pdev->id != -1)		if (pdev->id != -1)
	dev_set_name(&pdev->dev, "%s.%d", pdev->name, pdev->id);		dev_set_name(&pdev->dev, "%s.%d", pdev->name, pdev->id);
	else		else
	dev_set_name(&pdev->dev, pdev->name);		dev_set_name(&pdev->dev, "%s", pdev->name);

	for (i = 0; i < pdev->num_resources; i++) {		for (i = 0; i < pdev->num_resources; i++) {
	struct resource p, r = &pdev->resource[i];		struct resource p, r = &pdev->resource[i];

drivers/base/sys.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -141,7 +141,7 @@ int sysdev_class_register(struct sysdev_class *cls)
	cls->kset.kobj.ktype = &ktype_sysdev_class;		cls->kset.kobj.ktype = &ktype_sysdev_class;
	cls->kset.kobj.kset = system_kset;		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)		if (retval)
	return retval;		return retval;