[<prev] [next>] [day] [month] [year] [list]
Message-ID: <20080711111216.638d0ad3@hyperion.delvare>
Date: Fri, 11 Jul 2008 11:12:16 +0200
From: Jean Delvare <khali@...ux-fr.org>
To: Greg Kroah-Hartman <gregkh@...e.de>
Cc: linux-kernel@...r.kernel.org
Subject: [PATCH] dev_printk doesn't modify dev
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@...ux-fr.org>
---
drivers/base/core.c | 2 +-
include/linux/device.h | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
--- linux-2.6.26-rc9.orig/include/linux/device.h 2008-06-05 12:25:13.000000000 +0200
+++ linux-2.6.26-rc9/include/linux/device.h 2008-07-11 10:47:03.000000000 +0200
@@ -379,7 +379,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;
@@ -495,7 +495,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)
--- linux-2.6.26-rc9.orig/drivers/base/core.c 2008-06-13 16:08:57.000000000 +0200
+++ linux-2.6.26-rc9/drivers/base/core.c 2008-07-11 10:47:37.000000000 +0200
@@ -49,7 +49,7 @@ static inline int device_is_not_partitio
* 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 :
--
Jean Delvare
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists