uevent environment changes fallout

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

2 files changed, 6 insertions, 19 deletions

diff --git a/drivers/mmc/core/sdio_bus.c b/drivers/mmc/core/sdio_bus.c
index 0713a8c71e54..233d0f9b3c4b 100644
--- a/drivers/mmc/core/sdio_bus.c
+++ b/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/drivers/ssb/main.c b/drivers/ssb/main.c
index cfd13eb866b8..c12a741b5574 100644
--- a/drivers/ssb/main.c
+++ b/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 = {