summaryrefslogtreecommitdiffstats
path: root/include/linux/device.h
diff options
context:
space:
mode:
authorJean Delvare <khali@linux-fr.org>2008-07-30 12:29:21 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2008-08-21 10:15:36 -0700
commitbf9ca69fc8d19d4034391d3df4c35dccdef9d28c (patch)
tree795984a46805dfea4d7975b0cf298d75c894df88 /include/linux/device.h
parent26d02d1db7d84729b1e49789341e69a493c60ceb (diff)
downloadlinux-bf9ca69fc8d19d4034391d3df4c35dccdef9d28c.tar.gz
linux-bf9ca69fc8d19d4034391d3df4c35dccdef9d28c.tar.bz2
linux-bf9ca69fc8d19d4034391d3df4c35dccdef9d28c.zip
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 {
/* Get the wakeup routines, which depend on struct device */
#include <linux/pm_wakeup.h>
-static inline const char *dev_name(struct device *dev)
+static inline const char *dev_name(const struct device *dev)
{
/* will be changed into kobject_name(&dev->kobj) in the near future */
return dev->bus_id;
@@ -518,7 +518,7 @@ extern void device_shutdown(void);
extern void sysdev_shutdown(void);
/* debugging and troubleshooting/diagnostic helpers. */
-extern const char *dev_driver_string(struct device *dev);
+extern const char *dev_driver_string(const struct device *dev);
#define dev_printk(level, dev, format, arg...) \
printk(level "%s %s: " format , dev_driver_string(dev) , \
dev_name(dev) , ## arg)