mirrors/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-01-23 16:53:58 -05:00
Code Activity

fsi: Move master attributes to fsi-master class

Browse source 
Populate fsi_master_class->dev_attrs with the existing attribute
definitions, so we don't need to explicitly register.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
Signed-off-by: Joel Stanley <joel@jms.id.au>
Acked-by: Alistair Popple <alistair@popple.id.au>
Link: https://lore.kernel.org/r/20191108051945.7109-3-joel@jms.id.au
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Jeremy Kerr 2019-11-08 15:49:36 +10:30 • committed by Greg Kroah-Hartman
parent 2e32c2d675
commit cf700ba035
1 changed files with 9 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
drivers/fsi/fsi-core.c
View file

@ -1241,8 +1241,17 @@ static ssize_t master_break_store(struct device *dev,
static DEVICE_ATTR(break, 0200, NULL, master_break_store); static DEVICE_ATTR(break, 0200, NULL, master_break_store);
static struct attribute *master_attrs[] = {
&dev_attr_break.attr,
&dev_attr_rescan.attr,
NULL
};
ATTRIBUTE_GROUPS(master);
struct class fsi_master_class = { struct class fsi_master_class = {
.name = "fsi-master", .name = "fsi-master",
.dev_groups = master_groups,
}; };
int fsi_master_register(struct fsi_master *master) int fsi_master_register(struct fsi_master *master)
@ -1261,20 +1270,6 @@ int fsi_master_register(struct fsi_master *master)
return rc; return rc;
} }
rc = device_create_file(&master->dev, &dev_attr_rescan);
if (rc) {
device_del(&master->dev);
ida_simple_remove(&master_ida, master->idx);
return rc;
}
rc = device_create_file(&master->dev, &dev_attr_break);
if (rc) {
device_del(&master->dev);
ida_simple_remove(&master_ida, master->idx);
return rc;
}
np = dev_of_node(&master->dev); np = dev_of_node(&master->dev);
if (!of_property_read_bool(np, "no-scan-on-init")) { if (!of_property_read_bool(np, "no-scan-on-init")) {
mutex_lock(&master->scan_lock); mutex_lock(&master->scan_lock);