PM / Domains: Do not stop devices after restoring their states
[linux-2.6.git] / drivers / base / firmware_class.c
index d45d1e1..5401814 100644 (file)
 #include <linux/interrupt.h>
 #include <linux/bitops.h>
 #include <linux/mutex.h>
-#include <linux/kthread.h>
+#include <linux/workqueue.h>
 #include <linux/highmem.h>
 #include <linux/firmware.h>
 #include <linux/slab.h>
+#include <linux/sched.h>
 
 #define to_dev(obj) container_of(obj, struct device, kobj)
 
@@ -27,6 +28,52 @@ MODULE_AUTHOR("Manuel Estrada Sainz");
 MODULE_DESCRIPTION("Multi purpose firmware loading support");
 MODULE_LICENSE("GPL");
 
+/* Builtin firmware support */
+
+#ifdef CONFIG_FW_LOADER
+
+extern struct builtin_fw __start_builtin_fw[];
+extern struct builtin_fw __end_builtin_fw[];
+
+static bool fw_get_builtin_firmware(struct firmware *fw, const char *name)
+{
+       struct builtin_fw *b_fw;
+
+       for (b_fw = __start_builtin_fw; b_fw != __end_builtin_fw; b_fw++) {
+               if (strcmp(name, b_fw->name) == 0) {
+                       fw->size = b_fw->size;
+                       fw->data = b_fw->data;
+                       return true;
+               }
+       }
+
+       return false;
+}
+
+static bool fw_is_builtin_firmware(const struct firmware *fw)
+{
+       struct builtin_fw *b_fw;
+
+       for (b_fw = __start_builtin_fw; b_fw != __end_builtin_fw; b_fw++)
+               if (fw->data == b_fw->data)
+                       return true;
+
+       return false;
+}
+
+#else /* Module case - no builtin firmware support */
+
+static inline bool fw_get_builtin_firmware(struct firmware *fw, const char *name)
+{
+       return false;
+}
+
+static inline bool fw_is_builtin_firmware(const struct firmware *fw)
+{
+       return false;
+}
+#endif
+
 enum {
        FW_STATUS_LOADING,
        FW_STATUS_DONE,
@@ -35,44 +82,43 @@ enum {
 
 static int loading_timeout = 60;       /* In seconds */
 
+static inline long firmware_loading_timeout(void)
+{
+       return loading_timeout > 0 ? loading_timeout * HZ : MAX_SCHEDULE_TIMEOUT;
+}
+
 /* fw_lock could be moved to 'struct firmware_priv' but since it is just
  * guarding for corner cases a global lock should be OK */
 static DEFINE_MUTEX(fw_lock);
 
 struct firmware_priv {
-       char *fw_id;
        struct completion completion;
-       struct bin_attribute attr_data;
        struct firmware *fw;
        unsigned long status;
        struct page **pages;
        int nr_pages;
        int page_array_size;
-       const char *vdata;
        struct timer_list timeout;
+       struct device dev;
        bool nowait;
+       char fw_id[];
 };
 
-#ifdef CONFIG_FW_LOADER
-extern struct builtin_fw __start_builtin_fw[];
-extern struct builtin_fw __end_builtin_fw[];
-#else /* Module case. Avoid ifdefs later; it'll all optimise out */
-static struct builtin_fw *__start_builtin_fw;
-static struct builtin_fw *__end_builtin_fw;
-#endif
+static struct firmware_priv *to_firmware_priv(struct device *dev)
+{
+       return container_of(dev, struct firmware_priv, dev);
+}
 
-static void
-fw_load_abort(struct firmware_priv *fw_priv)
+static void fw_load_abort(struct firmware_priv *fw_priv)
 {
        set_bit(FW_STATUS_ABORT, &fw_priv->status);
        wmb();
        complete(&fw_priv->completion);
 }
 
-static ssize_t
-firmware_timeout_show(struct class *class,
-                     struct class_attribute *attr,
-                     char *buf)
+static ssize_t firmware_timeout_show(struct class *class,
+                                    struct class_attribute *attr,
+                                    char *buf)
 {
        return sprintf(buf, "%d\n", loading_timeout);
 }
@@ -90,24 +136,39 @@ firmware_timeout_show(struct class *class,
  *
  *     Note: zero means 'wait forever'.
  **/
-static ssize_t
-firmware_timeout_store(struct class *class,
-                       struct class_attribute *attr,
-                       const char *buf, size_t count)
+static ssize_t firmware_timeout_store(struct class *class,
+                                     struct class_attribute *attr,
+                                     const char *buf, size_t count)
 {
        loading_timeout = simple_strtol(buf, NULL, 10);
        if (loading_timeout < 0)
                loading_timeout = 0;
+
        return count;
 }
 
-static CLASS_ATTR(timeout, 0644, firmware_timeout_show, firmware_timeout_store);
+static struct class_attribute firmware_class_attrs[] = {
+       __ATTR(timeout, S_IWUSR | S_IRUGO,
+               firmware_timeout_show, firmware_timeout_store),
+       __ATTR_NULL
+};
 
-static void fw_dev_release(struct device *dev);
+static void fw_dev_release(struct device *dev)
+{
+       struct firmware_priv *fw_priv = to_firmware_priv(dev);
+       int i;
+
+       for (i = 0; i < fw_priv->nr_pages; i++)
+               __free_page(fw_priv->pages[i]);
+       kfree(fw_priv->pages);
+       kfree(fw_priv);
+
+       module_put(THIS_MODULE);
+}
 
 static int firmware_uevent(struct device *dev, struct kobj_uevent_env *env)
 {
-       struct firmware_priv *fw_priv = dev_get_drvdata(dev);
+       struct firmware_priv *fw_priv = to_firmware_priv(dev);
 
        if (add_uevent_var(env, "FIRMWARE=%s", fw_priv->fw_id))
                return -ENOMEM;
@@ -121,6 +182,7 @@ static int firmware_uevent(struct device *dev, struct kobj_uevent_env *env)
 
 static struct class firmware_class = {
        .name           = "firmware",
+       .class_attrs    = firmware_class_attrs,
        .dev_uevent     = firmware_uevent,
        .dev_release    = fw_dev_release,
 };
@@ -128,8 +190,9 @@ static struct class firmware_class = {
 static ssize_t firmware_loading_show(struct device *dev,
                                     struct device_attribute *attr, char *buf)
 {
-       struct firmware_priv *fw_priv = dev_get_drvdata(dev);
+       struct firmware_priv *fw_priv = to_firmware_priv(dev);
        int loading = test_bit(FW_STATUS_LOADING, &fw_priv->status);
+
        return sprintf(buf, "%d\n", loading);
 }
 
@@ -165,17 +228,17 @@ static ssize_t firmware_loading_store(struct device *dev,
                                      struct device_attribute *attr,
                                      const char *buf, size_t count)
 {
-       struct firmware_priv *fw_priv = dev_get_drvdata(dev);
+       struct firmware_priv *fw_priv = to_firmware_priv(dev);
        int loading = simple_strtol(buf, NULL, 10);
        int i;
 
+       mutex_lock(&fw_lock);
+
+       if (!fw_priv->fw)
+               goto out;
+
        switch (loading) {
        case 1:
-               mutex_lock(&fw_lock);
-               if (!fw_priv->fw) {
-                       mutex_unlock(&fw_lock);
-                       break;
-               }
                firmware_free_data(fw_priv->fw);
                memset(fw_priv->fw, 0, sizeof(struct firmware));
                /* If the pages are not owned by 'struct firmware' */
@@ -186,7 +249,6 @@ static ssize_t firmware_loading_store(struct device *dev,
                fw_priv->page_array_size = 0;
                fw_priv->nr_pages = 0;
                set_bit(FW_STATUS_LOADING, &fw_priv->status);
-               mutex_unlock(&fw_lock);
                break;
        case 0:
                if (test_bit(FW_STATUS_LOADING, &fw_priv->status)) {
@@ -217,18 +279,19 @@ static ssize_t firmware_loading_store(struct device *dev,
                fw_load_abort(fw_priv);
                break;
        }
-
+out:
+       mutex_unlock(&fw_lock);
        return count;
 }
 
 static DEVICE_ATTR(loading, 0644, firmware_loading_show, firmware_loading_store);
 
-static ssize_t
-firmware_data_read(struct kobject *kobj, struct bin_attribute *bin_attr,
-                  char *buffer, loff_t offset, size_t count)
+static ssize_t firmware_data_read(struct file *filp, struct kobject *kobj,
+                                 struct bin_attribute *bin_attr,
+                                 char *buffer, loff_t offset, size_t count)
 {
        struct device *dev = to_dev(kobj);
-       struct firmware_priv *fw_priv = dev_get_drvdata(dev);
+       struct firmware_priv *fw_priv = to_firmware_priv(dev);
        struct firmware *fw;
        ssize_t ret_count;
 
@@ -267,8 +330,7 @@ out:
        return ret_count;
 }
 
-static int
-fw_realloc_buffer(struct firmware_priv *fw_priv, int min_size)
+static int fw_realloc_buffer(struct firmware_priv *fw_priv, int min_size)
 {
        int pages_needed = ALIGN(min_size, PAGE_SIZE) >> PAGE_SHIFT;
 
@@ -308,6 +370,7 @@ fw_realloc_buffer(struct firmware_priv *fw_priv, int min_size)
 
 /**
  * firmware_data_write - write method for firmware
+ * @filp: open sysfs file
  * @kobj: kobject for the device
  * @bin_attr: bin_attr structure
  * @buffer: buffer being written
@@ -317,12 +380,12 @@ fw_realloc_buffer(struct firmware_priv *fw_priv, int min_size)
  *     Data written to the 'data' attribute will be later handed to
  *     the driver as a firmware image.
  **/
-static ssize_t
-firmware_data_write(struct kobject *kobj, struct bin_attribute *bin_attr,
-                   char *buffer, loff_t offset, size_t count)
+static ssize_t firmware_data_write(struct file *filp, struct kobject *kobj,
+                                  struct bin_attribute *bin_attr,
+                                  char *buffer, loff_t offset, size_t count)
 {
        struct device *dev = to_dev(kobj);
-       struct firmware_priv *fw_priv = dev_get_drvdata(dev);
+       struct firmware_priv *fw_priv = to_firmware_priv(dev);
        struct firmware *fw;
        ssize_t retval;
 
@@ -363,199 +426,143 @@ out:
        return retval;
 }
 
-static struct bin_attribute firmware_attr_data_tmpl = {
-       .attr = {.name = "data", .mode = 0644},
+static struct bin_attribute firmware_attr_data = {
+       .attr = { .name = "data", .mode = 0644 },
        .size = 0,
        .read = firmware_data_read,
        .write = firmware_data_write,
 };
 
-static void fw_dev_release(struct device *dev)
-{
-       struct firmware_priv *fw_priv = dev_get_drvdata(dev);
-       int i;
-
-       for (i = 0; i < fw_priv->nr_pages; i++)
-               __free_page(fw_priv->pages[i]);
-       kfree(fw_priv->pages);
-       kfree(fw_priv->fw_id);
-       kfree(fw_priv);
-       kfree(dev);
-
-       module_put(THIS_MODULE);
-}
-
-static void
-firmware_class_timeout(u_long data)
+static void firmware_class_timeout(u_long data)
 {
        struct firmware_priv *fw_priv = (struct firmware_priv *) data;
+
        fw_load_abort(fw_priv);
 }
 
-static int fw_register_device(struct device **dev_p, const char *fw_name,
-                             struct device *device)
+static struct firmware_priv *
+fw_create_instance(struct firmware *firmware, const char *fw_name,
+                  struct device *device, bool uevent, bool nowait)
 {
-       int retval;
-       struct firmware_priv *fw_priv = kzalloc(sizeof(*fw_priv),
-                                               GFP_KERNEL);
-       struct device *f_dev = kzalloc(sizeof(*f_dev), GFP_KERNEL);
-
-       *dev_p = NULL;
+       struct firmware_priv *fw_priv;
+       struct device *f_dev;
 
-       if (!fw_priv || !f_dev) {
+       fw_priv = kzalloc(sizeof(*fw_priv) + strlen(fw_name) + 1 , GFP_KERNEL);
+       if (!fw_priv) {
                dev_err(device, "%s: kmalloc failed\n", __func__);
-               retval = -ENOMEM;
-               goto error_kfree;
+               return ERR_PTR(-ENOMEM);
        }
 
+       fw_priv->fw = firmware;
+       fw_priv->nowait = nowait;
+       strcpy(fw_priv->fw_id, fw_name);
        init_completion(&fw_priv->completion);
-       fw_priv->attr_data = firmware_attr_data_tmpl;
-       fw_priv->fw_id = kstrdup(fw_name, GFP_KERNEL);
-       if (!fw_priv->fw_id) {
-               dev_err(device, "%s: Firmware name allocation failed\n",
-                       __func__);
-               retval = -ENOMEM;
-               goto error_kfree;
-       }
+       setup_timer(&fw_priv->timeout,
+                   firmware_class_timeout, (u_long) fw_priv);
 
-       fw_priv->timeout.function = firmware_class_timeout;
-       fw_priv->timeout.data = (u_long) fw_priv;
-       init_timer(&fw_priv->timeout);
+       f_dev = &fw_priv->dev;
 
+       device_initialize(f_dev);
        dev_set_name(f_dev, "%s", dev_name(device));
        f_dev->parent = device;
        f_dev->class = &firmware_class;
-       dev_set_drvdata(f_dev, fw_priv);
-       dev_set_uevent_suppress(f_dev, 1);
-       retval = device_register(f_dev);
-       if (retval) {
-               dev_err(device, "%s: device_register failed\n", __func__);
-               put_device(f_dev);
-               return retval;
-       }
-       *dev_p = f_dev;
-       return 0;
 
-error_kfree:
-       kfree(f_dev);
-       kfree(fw_priv);
-       return retval;
+       return fw_priv;
 }
 
-static int fw_setup_device(struct firmware *fw, struct device **dev_p,
-                          const char *fw_name, struct device *device,
-                          int uevent, bool nowait)
+static struct firmware_priv *
+_request_firmware_prepare(const struct firmware **firmware_p, const char *name,
+                         struct device *device, bool uevent, bool nowait)
 {
-       struct device *f_dev;
+       struct firmware *firmware;
        struct firmware_priv *fw_priv;
-       int retval;
-
-       *dev_p = NULL;
-       retval = fw_register_device(&f_dev, fw_name, device);
-       if (retval)
-               goto out;
-
-       /* Need to pin this module until class device is destroyed */
-       __module_get(THIS_MODULE);
-
-       fw_priv = dev_get_drvdata(f_dev);
 
-       fw_priv->nowait = nowait;
+       if (!firmware_p)
+               return ERR_PTR(-EINVAL);
 
-       fw_priv->fw = fw;
-       sysfs_bin_attr_init(&fw_priv->attr_data);
-       retval = sysfs_create_bin_file(&f_dev->kobj, &fw_priv->attr_data);
-       if (retval) {
-               dev_err(device, "%s: sysfs_create_bin_file failed\n", __func__);
-               goto error_unreg;
+       *firmware_p = firmware = kzalloc(sizeof(*firmware), GFP_KERNEL);
+       if (!firmware) {
+               dev_err(device, "%s: kmalloc(struct firmware) failed\n",
+                       __func__);
+               return ERR_PTR(-ENOMEM);
        }
 
-       retval = device_create_file(f_dev, &dev_attr_loading);
-       if (retval) {
-               dev_err(device, "%s: device_create_file failed\n", __func__);
-               goto error_unreg;
+       if (fw_get_builtin_firmware(firmware, name)) {
+               dev_dbg(device, "firmware: using built-in firmware %s\n", name);
+               return NULL;
        }
 
-       if (uevent)
-               dev_set_uevent_suppress(f_dev, 0);
-       *dev_p = f_dev;
-       goto out;
+       fw_priv = fw_create_instance(firmware, name, device, uevent, nowait);
+       if (IS_ERR(fw_priv)) {
+               release_firmware(firmware);
+               *firmware_p = NULL;
+       }
+       return fw_priv;
+}
 
-error_unreg:
-       device_unregister(f_dev);
-out:
-       return retval;
+static void _request_firmware_cleanup(const struct firmware **firmware_p)
+{
+       release_firmware(*firmware_p);
+       *firmware_p = NULL;
 }
 
-static int
-_request_firmware(const struct firmware **firmware_p, const char *name,
-                struct device *device, int uevent, bool nowait)
+static int _request_firmware_load(struct firmware_priv *fw_priv, bool uevent,
+                                 long timeout)
 {
-       struct device *f_dev;
-       struct firmware_priv *fw_priv;
-       struct firmware *firmware;
-       struct builtin_fw *builtin;
-       int retval;
+       int retval = 0;
+       struct device *f_dev = &fw_priv->dev;
 
-       if (!firmware_p)
-               return -EINVAL;
+       dev_set_uevent_suppress(f_dev, true);
 
-       *firmware_p = firmware = kzalloc(sizeof(*firmware), GFP_KERNEL);
-       if (!firmware) {
-               dev_err(device, "%s: kmalloc(struct firmware) failed\n",
-                       __func__);
-               retval = -ENOMEM;
-               goto out;
+       /* Need to pin this module until class device is destroyed */
+       __module_get(THIS_MODULE);
+
+       retval = device_add(f_dev);
+       if (retval) {
+               dev_err(f_dev, "%s: device_register failed\n", __func__);
+               goto err_put_dev;
        }
 
-       for (builtin = __start_builtin_fw; builtin != __end_builtin_fw;
-            builtin++) {
-               if (strcmp(name, builtin->name))
-                       continue;
-               dev_dbg(device, "firmware: using built-in firmware %s\n", name);
-               firmware->size = builtin->size;
-               firmware->data = builtin->data;
-               return 0;
+       retval = device_create_bin_file(f_dev, &firmware_attr_data);
+       if (retval) {
+               dev_err(f_dev, "%s: sysfs_create_bin_file failed\n", __func__);
+               goto err_del_dev;
        }
 
-       if (uevent)
-               dev_dbg(device, "firmware: requesting %s\n", name);
+       retval = device_create_file(f_dev, &dev_attr_loading);
+       if (retval) {
+               dev_err(f_dev, "%s: device_create_file failed\n", __func__);
+               goto err_del_bin_attr;
+       }
 
-       retval = fw_setup_device(firmware, &f_dev, name, device,
-                                uevent, nowait);
-       if (retval)
-               goto error_kfree_fw;
+       if (uevent) {
+               dev_set_uevent_suppress(f_dev, false);
+               dev_dbg(f_dev, "firmware: requesting %s\n", fw_priv->fw_id);
+               if (timeout != MAX_SCHEDULE_TIMEOUT)
+                       mod_timer(&fw_priv->timeout,
+                                 round_jiffies_up(jiffies + timeout));
 
-       fw_priv = dev_get_drvdata(f_dev);
+               kobject_uevent(&fw_priv->dev.kobj, KOBJ_ADD);
+       }
 
-       if (uevent) {
-               if (loading_timeout > 0) {
-                       fw_priv->timeout.expires = jiffies + loading_timeout * HZ;
-                       add_timer(&fw_priv->timeout);
-               }
+       wait_for_completion(&fw_priv->completion);
 
-               kobject_uevent(&f_dev->kobj, KOBJ_ADD);
-               wait_for_completion(&fw_priv->completion);
-               set_bit(FW_STATUS_DONE, &fw_priv->status);
-               del_timer_sync(&fw_priv->timeout);
-       } else
-               wait_for_completion(&fw_priv->completion);
+       set_bit(FW_STATUS_DONE, &fw_priv->status);
+       del_timer_sync(&fw_priv->timeout);
 
        mutex_lock(&fw_lock);
-       if (!fw_priv->fw->size || test_bit(FW_STATUS_ABORT, &fw_priv->status)) {
+       if (!fw_priv->fw->size || test_bit(FW_STATUS_ABORT, &fw_priv->status))
                retval = -ENOENT;
-               release_firmware(fw_priv->fw);
-               *firmware_p = NULL;
-       }
        fw_priv->fw = NULL;
        mutex_unlock(&fw_lock);
-       device_unregister(f_dev);
-       goto out;
 
-error_kfree_fw:
-       kfree(firmware);
-       *firmware_p = NULL;
-out:
+       device_remove_file(f_dev, &dev_attr_loading);
+err_del_bin_attr:
+       device_remove_bin_file(f_dev, &firmware_attr_data);
+err_del_dev:
+       device_del(f_dev);
+err_put_dev:
+       put_device(f_dev);
        return retval;
 }
 
@@ -578,27 +585,37 @@ int
 request_firmware(const struct firmware **firmware_p, const char *name,
                  struct device *device)
 {
-        int uevent = 1;
-        return _request_firmware(firmware_p, name, device, uevent, false);
+       struct firmware_priv *fw_priv;
+       int ret;
+
+       fw_priv = _request_firmware_prepare(firmware_p, name, device, true,
+                                           false);
+       if (IS_ERR_OR_NULL(fw_priv))
+               return PTR_RET(fw_priv);
+
+       ret = usermodehelper_read_trylock();
+       if (WARN_ON(ret)) {
+               dev_err(device, "firmware: %s will not be loaded\n", name);
+       } else {
+               ret = _request_firmware_load(fw_priv, true,
+                                       firmware_loading_timeout());
+               usermodehelper_read_unlock();
+       }
+       if (ret)
+               _request_firmware_cleanup(firmware_p);
+
+       return ret;
 }
 
 /**
  * release_firmware: - release the resource associated with a firmware image
  * @fw: firmware resource to release
  **/
-void
-release_firmware(const struct firmware *fw)
+void release_firmware(const struct firmware *fw)
 {
-       struct builtin_fw *builtin;
-
        if (fw) {
-               for (builtin = __start_builtin_fw; builtin != __end_builtin_fw;
-                    builtin++) {
-                       if (fw->data == builtin->data)
-                               goto free_fw;
-               }
-               firmware_free_data(fw);
-       free_fw:
+               if (!fw_is_builtin_firmware(fw))
+                       firmware_free_data(fw);
                kfree(fw);
        }
 }
@@ -611,27 +628,42 @@ struct firmware_work {
        struct device *device;
        void *context;
        void (*cont)(const struct firmware *fw, void *context);
-       int uevent;
+       bool uevent;
 };
 
-static int
-request_firmware_work_func(void *arg)
+static void request_firmware_work_func(struct work_struct *work)
 {
-       struct firmware_work *fw_work = arg;
+       struct firmware_work *fw_work;
        const struct firmware *fw;
+       struct firmware_priv *fw_priv;
+       long timeout;
        int ret;
-       if (!arg) {
-               WARN_ON(1);
-               return 0;
+
+       fw_work = container_of(work, struct firmware_work, work);
+       fw_priv = _request_firmware_prepare(&fw, fw_work->name, fw_work->device,
+                       fw_work->uevent, true);
+       if (IS_ERR_OR_NULL(fw_priv)) {
+               ret = PTR_RET(fw_priv);
+               goto out;
+       }
+
+       timeout = usermodehelper_read_lock_wait(firmware_loading_timeout());
+       if (timeout) {
+               ret = _request_firmware_load(fw_priv, fw_work->uevent, timeout);
+               usermodehelper_read_unlock();
+       } else {
+               dev_dbg(fw_work->device, "firmware: %s loading timed out\n",
+                       fw_work->name);
+               ret = -EAGAIN;
        }
-       ret = _request_firmware(&fw, fw_work->name, fw_work->device,
-               fw_work->uevent, true);
+       if (ret)
+               _request_firmware_cleanup(&fw);
 
+ out:
        fw_work->cont(fw, fw_work->context);
 
        module_put(fw_work->module);
        kfree(fw_work);
-       return ret;
 }
 
 /**
@@ -653,62 +685,39 @@ request_firmware_work_func(void *arg)
  **/
 int
 request_firmware_nowait(
-       struct module *module, int uevent,
+       struct module *module, bool uevent,
        const char *name, struct device *device, gfp_t gfp, void *context,
        void (*cont)(const struct firmware *fw, void *context))
 {
-       struct task_struct *task;
-       struct firmware_work *fw_work = kmalloc(sizeof (struct firmware_work),
-                                               gfp);
+       struct firmware_work *fw_work;
 
+       fw_work = kzalloc(sizeof (struct firmware_work), gfp);
        if (!fw_work)
                return -ENOMEM;
+
+       fw_work->module = module;
+       fw_work->name = name;
+       fw_work->device = device;
+       fw_work->context = context;
+       fw_work->cont = cont;
+       fw_work->uevent = uevent;
+
        if (!try_module_get(module)) {
                kfree(fw_work);
                return -EFAULT;
        }
 
-       *fw_work = (struct firmware_work) {
-               .module = module,
-               .name = name,
-               .device = device,
-               .context = context,
-               .cont = cont,
-               .uevent = uevent,
-       };
-
-       task = kthread_run(request_firmware_work_func, fw_work,
-                           "firmware/%s", name);
-
-       if (IS_ERR(task)) {
-               fw_work->cont(NULL, fw_work->context);
-               module_put(fw_work->module);
-               kfree(fw_work);
-               return PTR_ERR(task);
-       }
+       INIT_WORK(&fw_work->work, request_firmware_work_func);
+       schedule_work(&fw_work->work);
        return 0;
 }
 
-static int __init
-firmware_class_init(void)
+static int __init firmware_class_init(void)
 {
-       int error;
-       error = class_register(&firmware_class);
-       if (error) {
-               printk(KERN_ERR "%s: class_register failed\n", __func__);
-               return error;
-       }
-       error = class_create_file(&firmware_class, &class_attr_timeout);
-       if (error) {
-               printk(KERN_ERR "%s: class_create_file failed\n",
-                      __func__);
-               class_unregister(&firmware_class);
-       }
-       return error;
-
+       return class_register(&firmware_class);
 }
-static void __exit
-firmware_class_exit(void)
+
+static void __exit firmware_class_exit(void)
 {
        class_unregister(&firmware_class);
 }