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

misc: c2port: use dev_bin_attrs instead of hand-coding it 

Classes support a list of default binary attributes, so use that in the
c2port driver, instead of hand creating and destroying the file, which
is racing with userspace.  Bonus is this removes lines of code.

Cc: Rodolfo Giometti <giometti@linux.it>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
--
 drivers/misc/c2port/core.c |   30 +++++++++++++-----------------
 1 file changed, 13 insertions(+), 17 deletions(-)
This commit is contained in:
Greg Kroah-Hartman 2013-07-08 11:34:19 -07:00
parent 3b2f64d00c
commit 3ce20a710f
1 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/misc/c2port/core.c
View File

@ -867,7 +867,8 @@ static struct device_attribute c2port_attrs[] = {
__ATTR_NULL, __ATTR_NULL,
}; };
static struct bin_attribute c2port_bin_attrs = { static struct bin_attribute c2port_bin_attrs[] = {
{
.attr = { .attr = {
.name = "flash_data", .name = "flash_data",
.mode = 0644 .mode = 0644
@ -875,6 +876,8 @@ static struct bin_attribute c2port_bin_attrs = {
.read = c2port_read_flash_data, .read = c2port_read_flash_data,
.write = c2port_write_flash_data, .write = c2port_write_flash_data,
/* .size is computed at run-time */ /* .size is computed at run-time */
},
__ATTR_NULL
}; };
/* /*
@ -907,6 +910,8 @@ struct c2port_device *c2port_device_register(char *name,
goto error_idr_alloc; goto error_idr_alloc;
c2dev->id = ret; c2dev->id = ret;
c2port_bin_attrs[0].size = ops->blocks_num * ops->block_size;
c2dev->dev = device_create(c2port_class, NULL, 0, c2dev, c2dev->dev = device_create(c2port_class, NULL, 0, c2dev,
"c2port%d", c2dev->id); "c2port%d", c2dev->id);
if (unlikely(IS_ERR(c2dev->dev))) { if (unlikely(IS_ERR(c2dev->dev))) {
@ -919,12 +924,6 @@ struct c2port_device *c2port_device_register(char *name,
c2dev->ops = ops; c2dev->ops = ops;
mutex_init(&c2dev->mutex); mutex_init(&c2dev->mutex);
/* Create binary file */
c2port_bin_attrs.size = ops->blocks_num * ops->block_size;
ret = device_create_bin_file(c2dev->dev, &c2port_bin_attrs);
if (unlikely(ret))
goto error_device_create_bin_file;
/* By default C2 port access is off */ /* By default C2 port access is off */
c2dev->access = c2dev->flash_access = 0; c2dev->access = c2dev->flash_access = 0;
ops->access(c2dev, 0); ops->access(c2dev, 0);
@ -937,9 +936,6 @@ struct c2port_device *c2port_device_register(char *name,
return c2dev; return c2dev;
error_device_create_bin_file:
device_destroy(c2port_class, 0);
error_device_create: error_device_create:
spin_lock_irq(&c2port_idr_lock); spin_lock_irq(&c2port_idr_lock);
idr_remove(&c2port_idr, c2dev->id); idr_remove(&c2port_idr, c2dev->id);
@ -959,7 +955,6 @@ void c2port_device_unregister(struct c2port_device *c2dev)
dev_info(c2dev->dev, "C2 port %s removed\n", c2dev->name); dev_info(c2dev->dev, "C2 port %s removed\n", c2dev->name);
device_remove_bin_file(c2dev->dev, &c2port_bin_attrs);
spin_lock_irq(&c2port_idr_lock); spin_lock_irq(&c2port_idr_lock);
idr_remove(&c2port_idr, c2dev->id); idr_remove(&c2port_idr, c2dev->id);
spin_unlock_irq(&c2port_idr_lock); spin_unlock_irq(&c2port_idr_lock);
@ -985,6 +980,7 @@ static int __init c2port_init(void)
return PTR_ERR(c2port_class); return PTR_ERR(c2port_class);
} }
c2port_class->dev_attrs = c2port_attrs; c2port_class->dev_attrs = c2port_attrs;
c2port_class->dev_bin_attrs = c2port_bin_attrs;
return 0; return 0;
} }