From 55b50b910eceaa64163a1eade6d44ed3fb21e653 Mon Sep 17 00:00:00 2001
From: Al Viro <viro@ftp.linux.org.uk>
Date: Sun, 14 Oct 2007 05:46:09 +0100
Subject: [PATCH] --- yaml --- r: 68607 b: refs/heads/master c:
 7ac0326c3fd3f7cd2426dbbce896a0f8c91b962f h: refs/heads/master i:   68605:
 c54c97145dc202e03eafcacd6ffa2b1a077edc63   68603:
 1baf4b40f60b4a380b7c7521ebef79db5d496aa4   68599:
 36e691ae2cdeb2aad1cc2632cc419e7be479cd48   68591:
 e0c6b86a896cb1a774c082be55862645fbea9bcc   68575:
 d22824cc5e9a9dfbe1b690f3a91c85a9ae33613b   68543:
 30ba5ccd73e82d32029d23d1a7d4bbca10001d2c   68479:
 10c9597cf333e6da7b992d8af13909b8127f604c   68351:
 fc9b9738055c1749ecc90c13c75e0b2895aa7b0c   68095:
 0004d0fec4c59b678241a188f00626b0fef8a40c   67583:
 7d723b3957ba0fa14ccd60f00332d283f39b1ac2 v: v3

---
 [refs]                            |  2 +-
 trunk/drivers/mmc/core/sdio_bus.c | 15 ++++-----------
 trunk/drivers/ssb/main.c          | 10 ++--------
 3 files changed, 7 insertions(+), 20 deletions(-)

diff --git a/[refs] b/[refs]
index 468ccafc369c..c68e7a5c8f95 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4735b37cf434175c2b7b36b3b68f1e60e8ec8527
+refs/heads/master: 7ac0326c3fd3f7cd2426dbbce896a0f8c91b962f
diff --git a/trunk/drivers/mmc/core/sdio_bus.c b/trunk/drivers/mmc/core/sdio_bus.c
index 0713a8c71e54..233d0f9b3c4b 100644
--- a/trunk/drivers/mmc/core/sdio_bus.c
+++ b/trunk/drivers/mmc/core/sdio_bus.c
@@ -96,30 +96,23 @@ static int sdio_bus_match(struct device *dev, struct device_driver *drv)
 }
 
 static int
-sdio_bus_uevent(struct device *dev, char **envp, int num_envp, char *buf,
-		int buf_size)
+sdio_bus_uevent(struct device *dev, struct kobj_uevent_env *env)
 {
 	struct sdio_func *func = dev_to_sdio_func(dev);
-	int i = 0, length = 0;
 
-	if (add_uevent_var(envp, num_envp, &i,
-			buf, buf_size, &length,
+	if (add_uevent_var(env,
 			"SDIO_CLASS=%02X", func->class))
 		return -ENOMEM;
 
-	if (add_uevent_var(envp, num_envp, &i,
-			buf, buf_size, &length,
+	if (add_uevent_var(env, 
 			"SDIO_ID=%04X:%04X", func->vendor, func->device))
 		return -ENOMEM;
 
-	if (add_uevent_var(envp, num_envp, &i,
-			buf, buf_size, &length,
+	if (add_uevent_var(env,
 			"MODALIAS=sdio:c%02Xv%04Xd%04X",
 			func->class, func->vendor, func->device))
 		return -ENOMEM;
 
-	envp[i] = NULL;
-
 	return 0;
 }
 
diff --git a/trunk/drivers/ssb/main.c b/trunk/drivers/ssb/main.c
index cfd13eb866b8..c12a741b5574 100644
--- a/trunk/drivers/ssb/main.c
+++ b/trunk/drivers/ssb/main.c
@@ -321,23 +321,17 @@ static int ssb_bus_match(struct device *dev, struct device_driver *drv)
 	return 0;
 }
 
-static int ssb_device_uevent(struct device *dev, char **envp, int num_envp,
-			     char *buffer, int buffer_size)
+static int ssb_device_uevent(struct device *dev, struct kobj_uevent_env *env)
 {
 	struct ssb_device *ssb_dev = dev_to_ssb_dev(dev);
-	int ret, i = 0, length = 0;
 
 	if (!dev)
 		return -ENODEV;
 
-	ret = add_uevent_var(envp, num_envp, &i,
-			     buffer, buffer_size, &length,
+	return add_uevent_var(env,
 			     "MODALIAS=ssb:v%04Xid%04Xrev%02X",
 			     ssb_dev->id.vendor, ssb_dev->id.coreid,
 			     ssb_dev->id.revision);
-	envp[i] = NULL;
-
-	return ret;
 }
 
 static struct bus_type ssb_bustype = {