Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 324445
b: refs/heads/master
c: 05e4e5b
h: refs/heads/master
i:
  324443: e5baae1
v: v3
  • Loading branch information
Joe Perches authored and Greg Kroah-Hartman committed Sep 17, 2012
1 parent 42bc31c commit e1c1d75
Show file tree
Hide file tree
Showing 3 changed files with 39 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: c2c5a7051c556036b7beb8f4a89eefdc91c3245b
refs/heads/master: 05e4e5b87aab74f994acf9dd4bed4a8f1367cd09
27 changes: 27 additions & 0 deletions trunk/drivers/base/core.c
Original file line number Diff line number Diff line change
Expand Up @@ -1913,6 +1913,33 @@ int create_syslog_header(const struct device *dev, char *hdr, size_t hdrlen)
}
EXPORT_SYMBOL(create_syslog_header);

int dev_vprintk_emit(int level, const struct device *dev,
const char *fmt, va_list args)
{
char hdr[128];
size_t hdrlen;

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

return vprintk_emit(0, level, hdrlen ? hdr : NULL, hdrlen, fmt, args);
}
EXPORT_SYMBOL(dev_vprintk_emit);

int dev_printk_emit(int level, const struct device *dev, const char *fmt, ...)
{
va_list args;
int r;

va_start(args, fmt);

r = dev_vprintk_emit(level, dev, fmt, args);

va_end(args);

return r;
}
EXPORT_SYMBOL(dev_printk_emit);

static int __dev_printk(const char *level, const struct device *dev,
struct va_format *vaf)
{
Expand Down
11 changes: 11 additions & 0 deletions trunk/include/linux/device.h
Original file line number Diff line number Diff line change
Expand Up @@ -897,6 +897,10 @@ extern const char *dev_driver_string(const struct device *dev);

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)
int dev_printk_emit(int level, const struct device *dev, const char *fmt, ...);

extern __printf(3, 4)
int dev_printk(const char *level, const struct device *dev,
Expand All @@ -918,6 +922,13 @@ int _dev_info(const struct device *dev, const char *fmt, ...);

#else

static int dev_vprintk_emit(int level, const struct device *dev,
const char *fmt, va_list args)
{ return 0; }
static inline __printf(3, 4)
int dev_printk_emit(int level, const struct device *dev, const char *fmt, ...)
{ return 0; }

static inline int __dev_printk(const char *level, const struct device *dev,
struct va_format *vaf)
{ return 0; }
Expand Down

0 comments on commit e1c1d75

Please sign in to comment.