ide: split off ioctl handling from IDE settings (v2)

[powerpc.git] / drivers / base / firmware_class.c

diff --git a/drivers/base/firmware_class.c b/drivers/base/firmware_class.c
index 4bad287..97ab5bd 100644 (file)
--- a/drivers/base/firmware_class.c
+++ b/drivers/base/firmware_class.c
@@ -31,11 +31,9 @@ enum {
        FW_STATUS_LOADING,
        FW_STATUS_DONE,
        FW_STATUS_ABORT,
-       FW_STATUS_READY,
-       FW_STATUS_READY_NOHOTPLUG,
 };
 
-static int loading_timeout = 10;       /* In seconds */
+static int loading_timeout = 60;       /* In seconds */
 
 /* fw_lock could be moved to 'struct firmware_priv' but since it is just
  * guarding for corner cases a global lock should be OK */
@@ -96,9 +94,6 @@ static int firmware_uevent(struct device *dev, char **envp, int num_envp,
        struct firmware_priv *fw_priv = dev_get_drvdata(dev);
        int i = 0, len = 0;
 
-       if (!test_bit(FW_STATUS_READY, &fw_priv->status))
-               return -ENODEV;
-
        if (add_uevent_var(envp, num_envp, &i, buffer, buffer_size, &len,
                           "FIRMWARE=%s", fw_priv->fw_id))
                return -ENOMEM;
@@ -127,6 +122,7 @@ static ssize_t firmware_loading_show(struct device *dev,
 /**
  * firmware_loading_store - set value in the 'loading' control file
  * @dev: device pointer
+ * @attr: device attribute pointer
  * @buf: buffer to scan for loading control value
  * @count: number of bytes in @buf
  *
@@ -332,6 +328,7 @@ static int fw_register_device(struct device **dev_p, const char *fw_name,
        f_dev->parent = device;
        f_dev->class = &firmware_class;
        dev_set_drvdata(f_dev, fw_priv);
+       f_dev->uevent_suppress = 1;
        retval = device_register(f_dev);
        if (retval) {
                printk(KERN_ERR "%s: device_register failed\n",
@@ -381,9 +378,7 @@ static int fw_setup_device(struct firmware *fw, struct device **dev_p,
        }
 
        if (uevent)
-                set_bit(FW_STATUS_READY, &fw_priv->status);
-        else
-                set_bit(FW_STATUS_READY_NOHOTPLUG, &fw_priv->status);
+               f_dev->uevent_suppress = 0;
        *dev_p = f_dev;
        goto out;