fsi: Add fsi_master_rescan() (15362d69) · Commits · 戴 / test

We'll want non-core fsi code to trigger a rescan, so introduce a non-static fsi_master_rescan() function. Use this for the existing unscan/scan behaviour too. Signed-off-by:

Jeremy Kerr <jk@ozlabs.org> Reviewed-by:

Joel Stanley <joel@jms.id.au> Reviewed-by:

Christopher Bostic <clbostic@linux.vnet.ibm.com> Signed-off-by:

Joel Stanley <joel@jms.id.au> Signed-off-by:

Greg Kroah-Hartman <gregkh@linuxfoundation.org>

drivers/fsi/fsi-core.c

+8 −2

Original line number	Diff line number	Diff line
		@@ -762,14 +762,20 @@ static void fsi_master_unscan(struct fsi_master *master)
		device_for_each_child(&master->dev, NULL, fsi_master_remove_slave);
		}

		int fsi_master_rescan(struct fsi_master *master)
		{
		fsi_master_unscan(master);
		return fsi_master_scan(master);
		}
		EXPORT_SYMBOL_GPL(fsi_master_rescan);

		static ssize_t master_rescan_store(struct device *dev,
		struct device_attribute attr, const char buf, size_t count)
		{
		struct fsi_master *master = to_fsi_master(dev);
		int rc;

		fsi_master_unscan(master);
		rc = fsi_master_scan(master);
		rc = fsi_master_rescan(master);
		if (rc < 0)
		return rc;

drivers/fsi/fsi-master.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -40,4 +40,6 @@ struct fsi_master {
		extern int fsi_master_register(struct fsi_master *master);
		extern void fsi_master_unregister(struct fsi_master *master);

		extern int fsi_master_rescan(struct fsi_master *master);

		#endif /* DRIVERS_FSI_MASTER_H */

Admin message