From 1931b542f6cef887f9212396262a51892d50d1cb Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Mon, 21 Jul 2008 20:03:34 -0700
Subject: [PATCH] --- yaml --- r: 104741 b: refs/heads/master c:
 4e10673944a5c386378ff9d692ae37e19993f9d5 h: refs/heads/master i:   104739:
 92e7223db28d8307be3a93701f0ae2df999cfde0 v: v3

---
 [refs]                       |  2 +-
 trunk/drivers/base/core.c    | 11 ++++-------
 trunk/include/linux/device.h |  9 ++++-----
 3 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/[refs] b/[refs]
index 6ad6181c6b04..03ab828eeab4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ccea44fadca396b0f89aed5bdeb60e4abb212566
+refs/heads/master: 4e10673944a5c386378ff9d692ae37e19993f9d5
diff --git a/trunk/drivers/base/core.c b/trunk/drivers/base/core.c
index 4dc0d272f6d9..9ae28aa709d5 100644
--- a/trunk/drivers/base/core.c
+++ b/trunk/drivers/base/core.c
@@ -1236,7 +1236,7 @@ struct device *device_create_vargs(struct class *class, struct device *parent,
 EXPORT_SYMBOL_GPL(device_create_vargs);
 
 /**
- * device_create_drvdata - creates a device and registers it with sysfs
+ * device_create - creates a device and registers it with sysfs
  * @class: pointer to the struct class that this device should be registered to
  * @parent: pointer to the parent struct device of this new device, if any
  * @devt: the dev_t for the char device to be added
@@ -1257,11 +1257,8 @@ EXPORT_SYMBOL_GPL(device_create_vargs);
  * Note: the struct class passed to this function must have previously
  * been created with a call to class_create().
  */
-struct device *device_create_drvdata(struct class *class,
-				     struct device *parent,
-				     dev_t devt,
-				     void *drvdata,
-				     const char *fmt, ...)
+struct device *device_create(struct class *class, struct device *parent,
+			     dev_t devt, void *drvdata, const char *fmt, ...)
 {
 	va_list vargs;
 	struct device *dev;
@@ -1271,7 +1268,7 @@ struct device *device_create_drvdata(struct class *class,
 	va_end(vargs);
 	return dev;
 }
-EXPORT_SYMBOL_GPL(device_create_drvdata);
+EXPORT_SYMBOL_GPL(device_create);
 
 static int __match_devt(struct device *dev, void *data)
 {
diff --git a/trunk/include/linux/device.h b/trunk/include/linux/device.h
index a3ef5a2d4fbb..de178712e02c 100644
--- a/trunk/include/linux/device.h
+++ b/trunk/include/linux/device.h
@@ -470,12 +470,11 @@ extern struct device *device_create_vargs(struct class *cls,
 					  void *drvdata,
 					  const char *fmt,
 					  va_list vargs);
-extern struct device *device_create_drvdata(struct class *cls,
-					    struct device *parent,
-					    dev_t devt,
-					    void *drvdata,
-					    const char *fmt, ...)
+extern struct device *device_create(struct class *cls, struct device *parent,
+				    dev_t devt, void *drvdata,
+				    const char *fmt, ...)
 				    __attribute__((format(printf, 5, 6)));
+#define device_create_drvdata	device_create
 extern void device_destroy(struct class *cls, dev_t devt);
 
 /*