aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFerenc Wagner <wferi@niif.hu>2011-01-07 15:17:47 +0100
committerGreg Kroah-Hartman <gregkh@suse.de>2011-02-03 16:36:40 -0800
commit481e20799bdcf98fd5a1d829d187239a90b15395 (patch)
tree70e2560564252c84edf64ff3822d4ac9702a9b5a
parent6add7cd618b4d4dc525731beb539c5e06e891855 (diff)
driver core: Replace the dangerous to_root_device macro with an inline function
The original macro worked only when applied to variables named 'dev'. While this could have been fixed by simply renaming the macro argument, a more type-safe replacement by an inline function is preferred. Signed-off-by: Ferenc Wagner <wferi@niif.hu> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/base/core.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/base/core.c b/drivers/base/core.c
index 9cd3b5cfcc4..81b78ede37c 100644
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -1320,7 +1320,10 @@ struct root_device
struct module *owner;
};
-#define to_root_device(dev) container_of(dev, struct root_device, dev)
+inline struct root_device *to_root_device(struct device *d)
+{
+ return container_of(d, struct root_device, dev);
+}
static void root_device_release(struct device *dev)
{