diff options
author | Joe Perches <joe@perches.com> | 2012-09-12 23:14:11 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-09-17 09:10:05 -0400 |
commit | 666f355f3805d68b6ed5f7013806f1f65abfbf03 (patch) | |
tree | a04490ab9e68e4113410b7e7399edb9369545dfe /drivers/base/core.c | |
parent | 05e4e5b87aab74f994acf9dd4bed4a8f1367cd09 (diff) |
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: Joe Perches <joe@perches.com>
Acked-by: David S. Miller <davem@davemloft.net>
Tested-by: Jim Cromie <jim.cromie@gmail.com>
Acked-by: Jason Baron <jbaron@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/base/core.c')
-rw-r--r-- | drivers/base/core.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/drivers/base/core.c b/drivers/base/core.c index dff94c8fb35..abea76c36a4 100644 --- a/drivers/base/core.c +++ b/drivers/base/core.c | |||
@@ -1865,7 +1865,8 @@ void device_shutdown(void) | |||
1865 | */ | 1865 | */ |
1866 | 1866 | ||
1867 | #ifdef CONFIG_PRINTK | 1867 | #ifdef CONFIG_PRINTK |
1868 | int create_syslog_header(const struct device *dev, char *hdr, size_t hdrlen) | 1868 | static int |
1869 | create_syslog_header(const struct device *dev, char *hdr, size_t hdrlen) | ||
1869 | { | 1870 | { |
1870 | const char *subsys; | 1871 | const char *subsys; |
1871 | size_t pos = 0; | 1872 | size_t pos = 0; |
@@ -1943,17 +1944,12 @@ EXPORT_SYMBOL(dev_printk_emit); | |||
1943 | static int __dev_printk(const char *level, const struct device *dev, | 1944 | static int __dev_printk(const char *level, const struct device *dev, |
1944 | struct va_format *vaf) | 1945 | struct va_format *vaf) |
1945 | { | 1946 | { |
1946 | char hdr[128]; | ||
1947 | size_t hdrlen; | ||
1948 | |||
1949 | if (!dev) | 1947 | if (!dev) |
1950 | return printk("%s(NULL device *): %pV", level, vaf); | 1948 | return printk("%s(NULL device *): %pV", level, vaf); |
1951 | 1949 | ||
1952 | hdrlen = create_syslog_header(dev, hdr, sizeof(hdr)); | 1950 | return dev_printk_emit(level[1] - '0', dev, |
1953 | 1951 | "%s %s: %pV", | |
1954 | return printk_emit(0, level[1] - '0', hdrlen ? hdr : NULL, hdrlen, | 1952 | dev_driver_string(dev), dev_name(dev), vaf); |
1955 | "%s %s: %pV", | ||
1956 | dev_driver_string(dev), dev_name(dev), vaf); | ||
1957 | } | 1953 | } |
1958 | 1954 | ||
1959 | int dev_printk(const char *level, const struct device *dev, | 1955 | int dev_printk(const char *level, const struct device *dev, |