diff options
-rw-r--r-- | drivers/base/core.c | 2 | ||||
-rw-r--r-- | include/linux/device.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/base/core.c b/drivers/base/core.c index 068aa1c9538c..44bad73d8192 100644 --- a/drivers/base/core.c +++ b/drivers/base/core.c | |||
@@ -53,7 +53,7 @@ static inline int device_is_not_partition(struct device *dev) | |||
53 | * it is attached to. If it is not attached to a bus either, an empty | 53 | * it is attached to. If it is not attached to a bus either, an empty |
54 | * string will be returned. | 54 | * string will be returned. |
55 | */ | 55 | */ |
56 | const char *dev_driver_string(struct device *dev) | 56 | const char *dev_driver_string(const struct device *dev) |
57 | { | 57 | { |
58 | return dev->driver ? dev->driver->name : | 58 | return dev->driver ? dev->driver->name : |
59 | (dev->bus ? dev->bus->name : | 59 | (dev->bus ? dev->bus->name : |
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 | ||
409 | static inline const char *dev_name(struct device *dev) | 409 | static 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); | |||
518 | extern void sysdev_shutdown(void); | 518 | extern void sysdev_shutdown(void); |
519 | 519 | ||
520 | /* debugging and troubleshooting/diagnostic helpers. */ | 520 | /* debugging and troubleshooting/diagnostic helpers. */ |
521 | extern const char *dev_driver_string(struct device *dev); | 521 | extern 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) |