* [Patch -mm 2/3] Driver core: switch firmware_class to uevent_suppress.
@ 2007-03-29 9:12 Cornelia Huck
2007-04-12 7:04 ` patch driver-core-switch-firmware_class-to-uevent_suppress.patch added to gregkh-2.6 tree gregkh
0 siblings, 1 reply; 2+ messages in thread
From: Cornelia Huck @ 2007-03-29 9:12 UTC (permalink / raw)
To: linux-kernel; +Cc: Andrew Morton, Greg K-H, Manuel Estrada Sainz, Eric Rannaud
From: Cornelia Huck <cornelia.huck@de.ibm.com>
Use uevent_suppress instead of returning an error code in
firmware_uevent(). Get rid of the now unneeded FW_STATUS_READY
and FW_STATUS_READY_NOHOTPLUG.
Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
---
drivers/base/firmware_class.c | 10 ++--------
1 files changed, 2 insertions(+), 8 deletions(-)
--- linux-2.6.21-rc5-mm1.orig/drivers/base/firmware_class.c
+++ linux-2.6.21-rc5-mm1/drivers/base/firmware_class.c
@@ -31,8 +31,6 @@ enum {
FW_STATUS_LOADING,
FW_STATUS_DONE,
FW_STATUS_ABORT,
- FW_STATUS_READY,
- FW_STATUS_READY_NOHOTPLUG,
};
static int loading_timeout = 60; /* In seconds */
@@ -96,9 +94,6 @@ static int firmware_uevent(struct device
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;
@@ -333,6 +328,7 @@ static int fw_register_device(struct dev
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",
@@ -382,9 +378,7 @@ static int fw_setup_device(struct firmwa
}
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;
^ permalink raw reply [flat|nested] 2+ messages in thread
* patch driver-core-switch-firmware_class-to-uevent_suppress.patch added to gregkh-2.6 tree
2007-03-29 9:12 [Patch -mm 2/3] Driver core: switch firmware_class to uevent_suppress Cornelia Huck
@ 2007-04-12 7:04 ` gregkh
0 siblings, 0 replies; 2+ messages in thread
From: gregkh @ 2007-04-12 7:04 UTC (permalink / raw)
To: cornelia.huck, akpm, eric.rannaud, greg, gregkh, linux-kernel, ranty
This is a note to let you know that I've just added the patch titled
Subject: Driver core: switch firmware_class to uevent_suppress.
to my gregkh-2.6 tree. Its filename is
driver-core-switch-firmware_class-to-uevent_suppress.patch
This tree can be found at
http://www.kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/patches/
>From cornelia.huck@de.ibm.com Thu Mar 29 02:10:23 2007
From: Cornelia Huck <cornelia.huck@de.ibm.com>
Date: Thu, 29 Mar 2007 11:12:14 +0200
Subject: Driver core: switch firmware_class to uevent_suppress.
To: linux-kernel <linux-kernel@vger.kernel.org>
Cc: Andrew Morton <akpm@linux-foundation.org>, Greg K-H <greg@kroah.com>, Manuel Estrada Sainz <ranty@debian.org>, Eric Rannaud <eric.rannaud@gmail.com>
Message-ID: <20070329111214.1c3aa250@gondolin.boeblingen.de.ibm.com>
From: Cornelia Huck <cornelia.huck@de.ibm.com>
Use uevent_suppress instead of returning an error code in
firmware_uevent(). Get rid of the now unneeded FW_STATUS_READY
and FW_STATUS_READY_NOHOTPLUG.
Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
drivers/base/firmware_class.c | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
--- a/drivers/base/firmware_class.c
+++ b/drivers/base/firmware_class.c
@@ -31,8 +31,6 @@ enum {
FW_STATUS_LOADING,
FW_STATUS_DONE,
FW_STATUS_ABORT,
- FW_STATUS_READY,
- FW_STATUS_READY_NOHOTPLUG,
};
static int loading_timeout = 60; /* In seconds */
@@ -96,9 +94,6 @@ static int firmware_uevent(struct device
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;
@@ -333,6 +328,7 @@ static int fw_register_device(struct dev
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",
@@ -382,9 +378,7 @@ static int fw_setup_device(struct firmwa
}
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;
Patches currently in gregkh-2.6 which might be from cornelia.huck@de.ibm.com are
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2007-04-12 7:05 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2007-03-29 9:12 [Patch -mm 2/3] Driver core: switch firmware_class to uevent_suppress Cornelia Huck
2007-04-12 7:04 ` patch driver-core-switch-firmware_class-to-uevent_suppress.patch added to gregkh-2.6 tree gregkh
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®