rapidio: update enumerator registration mechanism

[firefly-linux-kernel-4.4.55.git] / drivers / rapidio / rio-sysfs.c

diff --git a/drivers/rapidio/rio-sysfs.c b/drivers/rapidio/rio-sysfs.c
index 864e52f193e105ae006fe397c7ce11dada125617..0c4473e54f8616e5fd3a018429fb7fb0a2d83cf8 100644 (file)
--- a/drivers/rapidio/rio-sysfs.c
+++ b/drivers/rapidio/rio-sysfs.c
@@ -286,7 +286,6 @@ static ssize_t bus_scan_store(struct bus_type *bus, const char *buf,
                                size_t count)
 {
        long val;
-       struct rio_mport *port = NULL;
        int rc;
 
        if (kstrtol(buf, 0, &val) < 0)
@@ -300,21 +299,7 @@ static ssize_t bus_scan_store(struct bus_type *bus, const char *buf,
        if (val < 0 || val >= RIO_MAX_MPORTS)
                return -EINVAL;
 
-       port = rio_find_mport((int)val);
-
-       if (!port) {
-               pr_debug("RIO: %s: mport_%d not available\n",
-                        __func__, (int)val);
-               return -EINVAL;
-       }
-
-       if (!port->nscan)
-               return -EINVAL;
-
-       if (port->host_deviceid >= 0)
-               rc = port->nscan->enumerate(port, 0);
-       else
-               rc = port->nscan->discover(port, RIO_SCAN_ENUM_NO_WAIT);
+       rc = rio_mport_scan((int)val);
 exit:
        if (!rc)
                rc = count;