Commit eb7fbc9f authored by Christophe JAILLET's avatar Christophe JAILLET Committed by Greg Kroah-Hartman
Browse files

driver core: Add missing '\n' in log messages 



Message logged by 'dev_xxx()' or 'pr_xxx()' should end with a '\n'.

While at it, convert some "printk(KERN_" into equivalent but less verbose
(pr|dev)_xxx functions.

Signed-off-by: default avatarChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Link: https://lore.kernel.org/r/20200411133158.27390-1-christophe.jaillet@wanadoo.fr


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent baf1d9c1

drivers/base/dd.c

+13 −15
Original line number Diff line number Diff line
@@ -262,12 +262,12 @@ __setup("deferred_probe_timeout=", deferred_probe_timeout_setup); 
int driver_deferred_probe_check_state(struct device *dev)

{

	if (!IS_ENABLED(CONFIG_MODULES) && initcalls_done) {

		dev_warn(dev, "ignoring dependency for device, assuming no driver");

		dev_warn(dev, "ignoring dependency for device, assuming no driver\n");

		return -ENODEV;

	}



	if (!driver_deferred_probe_timeout) {

		dev_WARN(dev, "deferred probe timeout, ignoring dependency");

		dev_WARN(dev, "deferred probe timeout, ignoring dependency\n");

		return -ETIMEDOUT;

	}
@@ -283,7 +283,7 @@ static void deferred_probe_timeout_work_func(struct work_struct *work) 
	flush_work(&deferred_probe_work);



	list_for_each_entry_safe(private, p, &deferred_probe_pending_list, deferred_probe)

		dev_info(private->device, "deferred probe pending");

		dev_info(private->device, "deferred probe pending\n");

}

static DECLARE_DELAYED_WORK(deferred_probe_timeout_work, deferred_probe_timeout_work_func);
@@ -343,7 +343,7 @@ bool device_is_bound(struct device *dev) 
static void driver_bound(struct device *dev)

{

	if (device_is_bound(dev)) {

		printk(KERN_WARNING "%s: device %s already bound\n",

		pr_warn("%s: device %s already bound\n",

			__func__, kobject_name(&dev->kobj));

		return;

	}
@@ -512,7 +512,7 @@ re_probe: 
	}



	if (driver_sysfs_add(dev)) {

		printk(KERN_ERR "%s: driver_sysfs_add(%s) failed\n",

		pr_err("%s: driver_sysfs_add(%s) failed\n",

		       __func__, dev_name(dev));

		goto probe_failed;

	}
@@ -604,8 +604,7 @@ pinctrl_bind_failed: 
		break;

	default:

		/* driver matched but the probe failed */

		printk(KERN_WARNING

		       "%s: probe of %s failed with error %d\n",

		pr_warn("%s: probe of %s failed with error %d\n",

			drv->name, dev_name(dev), ret);

	}

	/*
@@ -631,7 +630,7 @@ static int really_probe_debug(struct device *dev, struct device_driver *drv) 
	ret = really_probe(dev, drv);

	rettime = ktime_get();

	delta = ktime_sub(rettime, calltime);

	printk(KERN_DEBUG "probe of %s returned %d after %lld usecs\n",

	pr_debug("probe of %s returned %d after %lld usecs\n",

		 dev_name(dev), ret, (s64) ktime_to_us(delta));

	return ret;

}
@@ -717,8 +716,7 @@ static inline bool cmdline_requested_async_probing(const char *drv_name) 
static int __init save_async_options(char *buf)

{

	if (strlen(buf) >= ASYNC_DRV_NAMES_MAX_LEN)

		printk(KERN_WARNING

			"Too long list of driver names for 'driver_async_probe'!\n");

		pr_warn("Too long list of driver names for 'driver_async_probe'!\n");



	strlcpy(async_probe_drv_names, buf, ASYNC_DRV_NAMES_MAX_LEN);

	return 0;
@@ -793,7 +791,7 @@ static int __device_attach_driver(struct device_driver *drv, void *_data) 
		dev_dbg(dev, "Device match requests probe deferral\n");

		driver_deferred_probe_add(dev);

	} else if (ret < 0) {

		dev_dbg(dev, "Bus failed to match device: %d", ret);

		dev_dbg(dev, "Bus failed to match device: %d\n", ret);

		return ret;

	} /* ret > 0 means positive match */
@@ -1026,7 +1024,7 @@ static int __driver_attach(struct device *dev, void *data) 
		dev_dbg(dev, "Device match requests probe deferral\n");

		driver_deferred_probe_add(dev);

	} else if (ret < 0) {

		dev_dbg(dev, "Bus failed to match device: %d", ret);

		dev_dbg(dev, "Bus failed to match device: %d\n", ret);

		return ret;

	} /* ret > 0 means positive match */

CRA Git | Maintained and supported by SUSTech CRA and CCSE