Pull bugzilla-9362 into release branch

[linux-2.6] / drivers / misc / tifm_core.c

diff --git a/drivers/misc/tifm_core.c b/drivers/misc/tifm_core.c
index 70220beb3e04257be48d5c6ab69b710218d6cc9d..8f77949f93dd879097604fcc817122bfcef60fbc 100644 (file)
--- a/drivers/misc/tifm_core.c
+++ b/drivers/misc/tifm_core.c
@@ -57,16 +57,11 @@ static int tifm_bus_match(struct device *dev, struct device_driver *drv)
        return 0;
 }
 
-static int tifm_uevent(struct device *dev, char **envp, int num_envp,
-                      char *buffer, int buffer_size)
+static int tifm_uevent(struct device *dev, struct kobj_uevent_env *env)
 {
        struct tifm_dev *sock = container_of(dev, struct tifm_dev, dev);
-       int i = 0;
-       int length = 0;
 
-       if (add_uevent_var(envp, num_envp, &i, buffer, buffer_size, &length,
-                          "TIFM_CARD_TYPE=%s",
-                          tifm_media_type_name(sock->type, 1)))
+       if (add_uevent_var(env, "TIFM_CARD_TYPE=%s", tifm_media_type_name(sock->type, 1)))
                return -ENOMEM;
 
        return 0;
@@ -115,23 +110,23 @@ static int tifm_device_remove(struct device *dev)
 
 static int tifm_device_suspend(struct device *dev, pm_message_t state)
 {
-       struct tifm_dev *fm_dev = container_of(dev, struct tifm_dev, dev);
+       struct tifm_dev *sock = container_of(dev, struct tifm_dev, dev);
        struct tifm_driver *drv = container_of(dev->driver, struct tifm_driver,
                                               driver);
 
        if (dev->driver && drv->suspend)
-               return drv->suspend(fm_dev, state);
+               return drv->suspend(sock, state);
        return 0;
 }
 
 static int tifm_device_resume(struct device *dev)
 {
-       struct tifm_dev *fm_dev = container_of(dev, struct tifm_dev, dev);
+       struct tifm_dev *sock = container_of(dev, struct tifm_dev, dev);
        struct tifm_driver *drv = container_of(dev->driver, struct tifm_driver,
                                               driver);
 
        if (dev->driver && drv->resume)
-               return drv->resume(fm_dev);
+               return drv->resume(sock);
        return 0;
 }
 
@@ -155,14 +150,14 @@ static struct device_attribute tifm_dev_attrs[] = {
 };
 
 static struct bus_type tifm_bus_type = {
-       .name           = "tifm",
-       .dev_attrs      = tifm_dev_attrs,
-       .match          = tifm_bus_match,
-       .uevent         = tifm_uevent,
-       .probe          = tifm_device_probe,
-       .remove         = tifm_device_remove,
-       .suspend        = tifm_device_suspend,
-       .resume         = tifm_device_resume
+       .name      = "tifm",
+       .dev_attrs = tifm_dev_attrs,
+       .match     = tifm_bus_match,
+       .uevent    = tifm_uevent,
+       .probe     = tifm_device_probe,
+       .remove    = tifm_device_remove,
+       .suspend   = tifm_device_suspend,
+       .resume    = tifm_device_resume
 };
 
 static void tifm_free(struct class_device *cdev)