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

Commit 666f355f authored by Joe Perches's avatar Joe Perches Committed by Greg Kroah-Hartman
Browse files

device and dynamic_debug: Use dev_vprintk_emit and dev_printk_emit 



Convert direct calls of vprintk_emit and printk_emit to the
dev_ equivalents.

Make create_syslog_header static.

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Acked-by: default avatarDavid S. Miller <davem@davemloft.net>
Tested-by: default avatarJim Cromie <jim.cromie@gmail.com>
Acked-by: default avatarJason Baron <jbaron@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 05e4e5b8

drivers/base/core.c

+5 −9
Original line number Diff line number Diff line
@@ -1865,7 +1865,8 @@ void device_shutdown(void) 
 */



#ifdef CONFIG_PRINTK

int create_syslog_header(const struct device *dev, char *hdr, size_t hdrlen)

static int

create_syslog_header(const struct device *dev, char *hdr, size_t hdrlen)

{

	const char *subsys;

	size_t pos = 0;
@@ -1943,15 +1944,10 @@ EXPORT_SYMBOL(dev_printk_emit); 
static int __dev_printk(const char *level, const struct device *dev,

			struct va_format *vaf)

{

	char hdr[128];

	size_t hdrlen;



	if (!dev)

		return printk("%s(NULL device *): %pV", level, vaf);



	hdrlen = create_syslog_header(dev, hdr, sizeof(hdr));



	return printk_emit(0, level[1] - '0', hdrlen ? hdr : NULL, hdrlen,

	return dev_printk_emit(level[1] - '0', dev,

			       "%s %s: %pV",

			       dev_driver_string(dev), dev_name(dev), vaf);

}

include/linux/device.h

+0 −2
Original line number Diff line number Diff line
@@ -895,8 +895,6 @@ extern const char *dev_driver_string(const struct device *dev); 


#ifdef CONFIG_PRINTK



extern int create_syslog_header(const struct device *dev,

				char *hdr, size_t hdrlen);

extern int dev_vprintk_emit(int level, const struct device *dev,

			    const char *fmt, va_list args);

extern __printf(3, 4)

lib/dynamic_debug.c

+11 −20
Original line number Diff line number Diff line
@@ -591,15 +591,11 @@ int __dynamic_dev_dbg(struct _ddebug *descriptor, 
		res = printk(KERN_DEBUG "(NULL device *): %pV", &vaf);

	} else {

		char buf[PREFIX_SIZE];

		char dict[128];

		size_t dictlen;



		dictlen = create_syslog_header(dev, dict, sizeof(dict));



		res = printk_emit(0, 7, dictlen ? dict : NULL, dictlen,

				  "%s%s %s: %pV",

		res = dev_printk_emit(7, dev, "%s%s %s: %pV",

				      dynamic_emit_prefix(descriptor, buf),

				  dev_driver_string(dev), dev_name(dev), &vaf);

				      dev_driver_string(dev), dev_name(dev),

				      &vaf);

	}



	va_end(args);
@@ -627,13 +623,8 @@ int __dynamic_netdev_dbg(struct _ddebug *descriptor, 


	if (dev && dev->dev.parent) {

		char buf[PREFIX_SIZE];

		char dict[128];

		size_t dictlen;



		dictlen = create_syslog_header(dev->dev.parent,

					       dict, sizeof(dict));



		res = printk_emit(0, 7, dictlen ? dict : NULL, dictlen,

		res = dev_printk_emit(7, dev->dev.parent,

				      "%s%s %s %s: %pV",

				      dynamic_emit_prefix(descriptor, buf),

				      dev_driver_string(dev->dev.parent),

net/core/dev.c

+6 −10
Original line number Diff line number Diff line
@@ -6429,12 +6429,8 @@ static int __netdev_printk(const char *level, const struct net_device *dev, 
	int r;



	if (dev && dev->dev.parent) {

		char dict[128];

		size_t dictlen = create_syslog_header(dev->dev.parent,

						      dict, sizeof(dict));



		r = printk_emit(0, level[1] - '0',

				dictlen ? dict : NULL, dictlen,

		r = dev_printk_emit(level[1] - '0',

				    dev->dev.parent,

				    "%s %s %s: %pV",

				    dev_driver_string(dev->dev.parent),

				    dev_name(dev->dev.parent),