fsi: Move master attributes to fsi-master class (cf700ba0) · Commits · 戴 / test

Populate fsi_master_class->dev_attrs with the existing attribute definitions, so we don't need to explicitly register. Signed-off-by:

drivers/fsi/fsi-core.c

+9 −14

Original line number	Diff line number	Diff line
		@@ -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);