aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/device.h
diff options
context:
space:
mode:
authorJean Delvare <khali@linux-fr.org>2008-07-30 15:29:21 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2008-08-21 13:15:36 -0400
commitbf9ca69fc8d19d4034391d3df4c35dccdef9d28c (patch)
tree795984a46805dfea4d7975b0cf298d75c894df88 /include/linux/device.h
parent26d02d1db7d84729b1e49789341e69a493c60ceb (diff)
dev_printk(): constify the `dev' argument
Add const markings to dev_name and dev_driver_string to make it clear that dev_printk doesn't modify dev. This is a prerequisite to adding more const markings to other functions make it clearer, which functions can modify dev and which can't. Signed-off-by: Jean Delvare <khali@linux-fr.org> Cc: Kay Sievers <kay.sievers@vrfy.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'include/linux/device.h')
-rw-r--r--include/linux/device.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/device.h b/include/linux/device.h
index d24a47f80f9c..a701c1b5184c 100644
--- a/include/linux/device.h
+++ b/include/linux/device.h
@@ -406,7 +406,7 @@ struct device {
406/* Get the wakeup routines, which depend on struct device */ 406/* Get the wakeup routines, which depend on struct device */
407#include <linux/pm_wakeup.h> 407#include <linux/pm_wakeup.h>
408 408
409static inline const char *dev_name(struct device *dev) 409static inline const char *dev_name(const struct device *dev)
410{ 410{
411 /* will be changed into kobject_name(&dev->kobj) in the near future */ 411 /* will be changed into kobject_name(&dev->kobj) in the near future */
412 return dev->bus_id; 412 return dev->bus_id;
@@ -518,7 +518,7 @@ extern void device_shutdown(void);
518extern void sysdev_shutdown(void); 518extern void sysdev_shutdown(void);
519 519
520/* debugging and troubleshooting/diagnostic helpers. */ 520/* debugging and troubleshooting/diagnostic helpers. */
521extern const char *dev_driver_string(struct device *dev); 521extern const char *dev_driver_string(const struct device *dev);
522#define dev_printk(level, dev, format, arg...) \ 522#define dev_printk(level, dev, format, arg...) \
523 printk(level "%s %s: " format , dev_driver_string(dev) , \ 523 printk(level "%s %s: " format , dev_driver_string(dev) , \
524 dev_name(dev) , ## arg) 524 dev_name(dev) , ## arg)