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 <j...@ozlabs.org>
Reviewed-by: Joel Stanley <j...@jms.id.au>
Reviewed-by: Christopher Bostic <clbos...@linux.vnet.ibm.com>
---
 drivers/fsi/fsi-core.c   | 9 +++++++--
 drivers/fsi/fsi-master.h | 2 ++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/drivers/fsi/fsi-core.c b/drivers/fsi/fsi-core.c
index a485864..28d917e 100644
--- a/drivers/fsi/fsi-core.c
+++ b/drivers/fsi/fsi-core.c
@@ -762,14 +762,19 @@ 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);
+}
+
 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;
 
diff --git a/drivers/fsi/fsi-master.h b/drivers/fsi/fsi-master.h
index 12f7b11..18bd4ad 100644
--- a/drivers/fsi/fsi-master.h
+++ b/drivers/fsi/fsi-master.h
@@ -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 */
-- 
2.7.4

Reply via email to