Acked-by: Alistair Popple <alistair@xxxxxxxxxxxx>
On Friday, 8 November 2019 4:19:36 PM AEDT Joel Stanley wrote:
> From: Jeremy Kerr <jk@xxxxxxxxxx>
>
> 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@xxxxxxxxxx>
> Signed-off-by: Joel Stanley <joel@xxxxxxxxx>
> ---
> drivers/fsi/fsi-core.c | 23 +++++++++--------------
> 1 file changed, 9 insertions(+), 14 deletions(-)
>
> diff --git a/drivers/fsi/fsi-core.c b/drivers/fsi/fsi-core.c
> index 0861f6097b33..c773c65a5058 100644
> --- a/drivers/fsi/fsi-core.c
> +++ b/drivers/fsi/fsi-core.c
> @@ -1241,8 +1241,17 @@ static ssize_t master_break_store(struct device *dev,
>
> 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 = {
> .name = "fsi-master",
> + .dev_groups = master_groups,
> };
>
> int fsi_master_register(struct fsi_master *master)
> @@ -1261,20 +1270,6 @@ int fsi_master_register(struct fsi_master *master)
> 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);
> if (!of_property_read_bool(np, "no-scan-on-init")) {
> mutex_lock(&master->scan_lock);
>
