uevent: use add_uevent_var() instead of open coding it

Make use of add_uevent_var() instead of (often incorrectly) open coding it.

Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
Signed-off-by: Eric Rannaud <eric.rannaud@gmail.com>
Cc: Kay Sievers <kay.sievers@vrfy.org>
Cc: Cornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

1 files changed, 32 insertions, 48 deletions

diff --git a/sound/aoa/soundbus/core.c b/sound/aoa/soundbus/core.c
index 47b3e3768df0..418a98a10c73 100644
--- a/sound/aoa/soundbus/core.c
+++ b/sound/aoa/soundbus/core.c
@@ -61,9 +61,9 @@ static int soundbus_uevent(struct device *dev, char **envp, int num_envp,
 {
         struct soundbus_dev * soundbus_dev;
         struct of_device * of;
-        char *scratch, *compat, *compat2;
-        int i = 0;
-        int length, cplen, cplen2, seen = 0;
+        char *compat;
+        int retval = 0, i = 0, length = 0;
+        int cplen, seen = 0;
 
         if (!dev)
                 return -ENODEV;
@@ -75,63 +75,47 @@ static int soundbus_uevent(struct device *dev, char **envp, int num_envp,
         of = &soundbus_dev->ofdev;
 
         /* stuff we want to pass to /sbin/hotplug */
-        envp[i++] = scratch = buffer;
-        length = scnprintf (scratch, buffer_size, "OF_NAME=%s", of->node->name);
-        ++length;
-        buffer_size -= length;
-        if ((buffer_size <= 0) || (i >= num_envp))
-                return -ENOMEM;
-        scratch += length;
-
-        envp[i++] = scratch;
-        length = scnprintf (scratch, buffer_size, "OF_TYPE=%s", of->node->type);
-        ++length;
-        buffer_size -= length;
-        if ((buffer_size <= 0) || (i >= num_envp))
-                return -ENOMEM;
-        scratch += length;
+        retval = add_uevent_var(envp, num_envp, &i,
+                                buffer, buffer_size, &length,
+                                "OF_NAME=%s", of->node->name);
+        if (retval)
+                return retval;
+
+        retval = add_uevent_var(envp, num_envp, &i,
+                                buffer, buffer_size, &length,
+                                "OF_TYPE=%s", of->node->type);
+        if (retval)
+                return retval;
 
         /* Since the compatible field can contain pretty much anything
          * it's not really legal to split it out with commas. We split it
          * up using a number of environment variables instead. */
 
         compat = (char *) get_property(of->node, "compatible", &cplen);
-        compat2 = compat;
-        cplen2= cplen;
         while (compat && cplen > 0) {
-                envp[i++] = scratch;
-                length = scnprintf (scratch, buffer_size,
-                                     "OF_COMPATIBLE_%d=%s", seen, compat);
-                ++length;
-                buffer_size -= length;
-                if ((buffer_size <= 0) || (i >= num_envp))
-                        return -ENOMEM;
-                scratch += length;
-                length = strlen (compat) + 1;
-                compat += length;
-                cplen -= length;
-                seen++;
+                int tmp = length;
+                retval = add_uevent_var(envp, num_envp, &i,
+                                        buffer, buffer_size, &length,
+                                        "OF_COMPATIBLE_%d=%s", seen, compat);
+                if (retval)
+                        return retval;
+                compat += length - tmp;
+                cplen -= length - tmp;
+                seen += 1;
         }
 
-        envp[i++] = scratch;
-        length = scnprintf (scratch, buffer_size, "OF_COMPATIBLE_N=%d", seen);
-        ++length;
-        buffer_size -= length;
-        if ((buffer_size <= 0) || (i >= num_envp))
-                return -ENOMEM;
-        scratch += length;
-
-        envp[i++] = scratch;
-        length = scnprintf (scratch, buffer_size, "MODALIAS=%s",
-                        soundbus_dev->modalias);
-
-        buffer_size -= length;
-        if ((buffer_size <= 0) || (i >= num_envp))
-                return -ENOMEM;
+        retval = add_uevent_var(envp, num_envp, &i,
+                                buffer, buffer_size, &length,
+                                "OF_COMPATIBLE_N=%d", seen);
+        if (retval)
+                return retval;
+        retval = add_uevent_var(envp, num_envp, &i,
+                                buffer, buffer_size, &length,
+                                "MODALIAS=%s", soundbus_dev->modalias);
 
         envp[i] = NULL;
 
-        return 0;
+        return retval;
 }
 
 static int soundbus_device_remove(struct device *dev)