openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

firmware loader: use statically initialized data attribute 

There is no reason why we are using a template for binary attribute
and copying it into per-firmware data before registering. Using the
original works as well.

Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Dmitry Torokhov 2010-06-04 00:54:37 -07:00 committed by Greg Kroah-Hartman
parent cc7447a5fa
commit 0983ca2d0f
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/base/firmware_class.c
View File

@ -87,7 +87,6 @@ static DEFINE_MUTEX(fw_lock);
struct firmware_priv { struct firmware_priv {
struct completion completion; struct completion completion;
struct bin_attribute attr_data;
struct firmware *fw; struct firmware *fw;
unsigned long status; unsigned long status;
struct page **pages; struct page **pages;
@ -420,8 +419,8 @@ firmware_data_write(struct file* filp, struct kobject *kobj,
return retval; return retval;
} }
static struct bin_attribute firmware_attr_data_tmpl = { static struct bin_attribute firmware_attr_data = {
.attr = {.name = "data", .mode = 0644}, .attr = { .name = "data", .mode = 0644 },
.size = 0, .size = 0,
.read = firmware_data_read, .read = firmware_data_read,
.write = firmware_data_write, .write = firmware_data_write,
@ -452,7 +451,6 @@ static int fw_register_device(struct device **dev_p, const char *fw_name,
strcpy(fw_priv->fw_id, fw_name); strcpy(fw_priv->fw_id, fw_name);
init_completion(&fw_priv->completion); init_completion(&fw_priv->completion);
fw_priv->attr_data = firmware_attr_data_tmpl;
fw_priv->timeout.function = firmware_class_timeout; fw_priv->timeout.function = firmware_class_timeout;
fw_priv->timeout.data = (u_long) fw_priv; fw_priv->timeout.data = (u_long) fw_priv;
init_timer(&fw_priv->timeout); init_timer(&fw_priv->timeout);
@ -498,8 +496,7 @@ static int fw_setup_device(struct firmware *fw, struct device **dev_p,
fw_priv->nowait = nowait; fw_priv->nowait = nowait;
fw_priv->fw = fw; fw_priv->fw = fw;
sysfs_bin_attr_init(&fw_priv->attr_data); retval = sysfs_create_bin_file(&f_dev->kobj, &firmware_attr_data);
retval = sysfs_create_bin_file(&f_dev->kobj, &fw_priv->attr_data);
if (retval) { if (retval) {
dev_err(device, "%s: sysfs_create_bin_file failed\n", __func__); dev_err(device, "%s: sysfs_create_bin_file failed\n", __func__);
goto error_unreg; goto error_unreg;