Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/net-2.6

[linux-2.6] / drivers / s390 / crypto / ap_bus.c

diff --git a/drivers/s390/crypto/ap_bus.c b/drivers/s390/crypto/ap_bus.c
index d334b0f7a1ec29dfea4f3f94290dd41ce762d5e6..67aaff3e668d8a3354c06ae23099e8611b921065 100644 (file)
--- a/drivers/s390/crypto/ap_bus.c
+++ b/drivers/s390/crypto/ap_bus.c
@@ -458,28 +458,22 @@ static int ap_bus_match(struct device *dev, struct device_driver *drv)
  * uevent function for AP devices. It sets up a single environment
  * variable DEV_TYPE which contains the hardware device type.
  */
-static int ap_uevent (struct device *dev, char **envp, int num_envp,
-                      char *buffer, int buffer_size)
+static int ap_uevent (struct device *dev, struct kobj_uevent_env *env)
 {
        struct ap_device *ap_dev = to_ap_dev(dev);
-       int retval = 0, length = 0, i = 0;
+       int retval = 0;
 
        if (!ap_dev)
                return -ENODEV;
 
        /* Set up DEV_TYPE environment variable. */
-       retval = add_uevent_var(envp, num_envp, &i,
-                               buffer, buffer_size, &length,
-                               "DEV_TYPE=%04X", ap_dev->device_type);
+       retval = add_uevent_var(env, "DEV_TYPE=%04X", ap_dev->device_type);
        if (retval)
                return retval;
 
        /* Add MODALIAS= */
-       retval = add_uevent_var(envp, num_envp, &i,
-                               buffer, buffer_size, &length,
-                               "MODALIAS=ap:t%02X", ap_dev->device_type);
+       retval = add_uevent_var(env, "MODALIAS=ap:t%02X", ap_dev->device_type);
 
-       envp[i] = NULL;
        return retval;
 }