diff options
Diffstat (limited to 'include/linux/device.h')
-rw-r--r-- | include/linux/device.h | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/include/linux/device.h b/include/linux/device.h index cf4ae5c5d193..dbbbe89e7267 100644 --- a/include/linux/device.h +++ b/include/linux/device.h | |||
@@ -565,6 +565,21 @@ extern const char *dev_driver_string(struct device *dev); | |||
565 | #define dev_printk(level, dev, format, arg...) \ | 565 | #define dev_printk(level, dev, format, arg...) \ |
566 | printk(level "%s %s: " format , dev_driver_string(dev) , (dev)->bus_id , ## arg) | 566 | printk(level "%s %s: " format , dev_driver_string(dev) , (dev)->bus_id , ## arg) |
567 | 567 | ||
568 | #define dev_emerg(dev, format, arg...) \ | ||
569 | dev_printk(KERN_EMERG , dev , format , ## arg) | ||
570 | #define dev_alert(dev, format, arg...) \ | ||
571 | dev_printk(KERN_ALERT , dev , format , ## arg) | ||
572 | #define dev_crit(dev, format, arg...) \ | ||
573 | dev_printk(KERN_CRIT , dev , format , ## arg) | ||
574 | #define dev_err(dev, format, arg...) \ | ||
575 | dev_printk(KERN_ERR , dev , format , ## arg) | ||
576 | #define dev_warn(dev, format, arg...) \ | ||
577 | dev_printk(KERN_WARNING , dev , format , ## arg) | ||
578 | #define dev_notice(dev, format, arg...) \ | ||
579 | dev_printk(KERN_NOTICE , dev , format , ## arg) | ||
580 | #define dev_info(dev, format, arg...) \ | ||
581 | dev_printk(KERN_INFO , dev , format , ## arg) | ||
582 | |||
568 | #ifdef DEBUG | 583 | #ifdef DEBUG |
569 | #define dev_dbg(dev, format, arg...) \ | 584 | #define dev_dbg(dev, format, arg...) \ |
570 | dev_printk(KERN_DEBUG , dev , format , ## arg) | 585 | dev_printk(KERN_DEBUG , dev , format , ## arg) |
@@ -586,15 +601,6 @@ dev_vdbg(struct device * dev, const char * fmt, ...) | |||
586 | } | 601 | } |
587 | #endif | 602 | #endif |
588 | 603 | ||
589 | #define dev_err(dev, format, arg...) \ | ||
590 | dev_printk(KERN_ERR , dev , format , ## arg) | ||
591 | #define dev_info(dev, format, arg...) \ | ||
592 | dev_printk(KERN_INFO , dev , format , ## arg) | ||
593 | #define dev_warn(dev, format, arg...) \ | ||
594 | dev_printk(KERN_WARNING , dev , format , ## arg) | ||
595 | #define dev_notice(dev, format, arg...) \ | ||
596 | dev_printk(KERN_NOTICE , dev , format , ## arg) | ||
597 | |||
598 | /* Create alias, so I can be autoloaded. */ | 604 | /* Create alias, so I can be autoloaded. */ |
599 | #define MODULE_ALIAS_CHARDEV(major,minor) \ | 605 | #define MODULE_ALIAS_CHARDEV(major,minor) \ |
600 | MODULE_ALIAS("char-major-" __stringify(major) "-" __stringify(minor)) | 606 | MODULE_ALIAS("char-major-" __stringify(major) "-" __stringify(minor)) |