From 09c532df39d0b5f0305aa73af40414ac60d28563 Mon Sep 17 00:00:00 2001 From: Jean Delvare Date: Wed, 30 Jul 2008 12:29:21 -0700 Subject: [PATCH] --- yaml --- r: 108987 b: refs/heads/master c: bf9ca69fc8d19d4034391d3df4c35dccdef9d28c h: refs/heads/master i: 108985: 72b103770c62c1b047e105cfb8a8989d954ade14 108983: eacb86f026d54053ff86954d1a4b3d9fb2d4e8ca v: v3 --- [refs] | 2 +- trunk/drivers/base/core.c | 2 +- trunk/include/linux/device.h | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index dd12622c84f4..e25f9bfcccc7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 26d02d1db7d84729b1e49789341e69a493c60ceb +refs/heads/master: bf9ca69fc8d19d4034391d3df4c35dccdef9d28c diff --git a/trunk/drivers/base/core.c b/trunk/drivers/base/core.c index 068aa1c9538c..44bad73d8192 100644 --- a/trunk/drivers/base/core.c +++ b/trunk/drivers/base/core.c @@ -53,7 +53,7 @@ static inline int device_is_not_partition(struct device *dev) * it is attached to. If it is not attached to a bus either, an empty * string will be returned. */ -const char *dev_driver_string(struct device *dev) +const char *dev_driver_string(const struct device *dev) { return dev->driver ? dev->driver->name : (dev->bus ? dev->bus->name : diff --git a/trunk/include/linux/device.h b/trunk/include/linux/device.h index d24a47f80f9c..a701c1b5184c 100644 --- a/trunk/include/linux/device.h +++ b/trunk/include/linux/device.h @@ -406,7 +406,7 @@ struct device { /* Get the wakeup routines, which depend on struct device */ #include -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)