Print this page
OS-1997 mpt_sas: expose LED controls to libtopo
Reviewed by: Keith Wesolowski <keith.wesolowski@joyent.com>
        
*** 1374,1393 ****
                  if (xmlStrcmp(cn->name, (xmlChar *)"fac-enum") != 0)
                          continue;
  
                  if ((fprov = xmlGetProp(cn, (xmlChar *)Provider)) == NULL)
                          goto fenumdone;
- 
-                 if (xmlStrcmp(fprov, (xmlChar *)"fac_prov_ipmi") != 0) {
-                         topo_dprintf(mp->tm_hdl, TOPO_DBG_XML,
-                             "Invalid provider specified: %s\n", fprov);
-                         goto fenumdone;
-                 }
- 
                  /*
!                  * Invoke enum entry point in fac provider which will cause the
!                  * facility enumeration node method to be registered.
                   */
                  if (fac_enum_run(mp, ptn, (const char *)fprov) != 0) {
                          topo_dprintf(mp->tm_hdl, TOPO_DBG_ERR,
                              "fac_enum_process: enum entry point failed!\n");
                          goto fenumdone;
--- 1374,1387 ----
                  if (xmlStrcmp(cn->name, (xmlChar *)"fac-enum") != 0)
                          continue;
  
                  if ((fprov = xmlGetProp(cn, (xmlChar *)Provider)) == NULL)
                          goto fenumdone;
                  /*
!                  * Invoke enum entry point in facility provider which will
!                  * cause the facility enumeration node method to be
!                  * registered.
                   */
                  if (fac_enum_run(mp, ptn, (const char *)fprov) != 0) {
                          topo_dprintf(mp->tm_hdl, TOPO_DBG_ERR,
                              "fac_enum_process: enum entry point failed!\n");
                          goto fenumdone;
*** 1438,1453 ****
  
                  if (xmlStrcmp(ftype, (xmlChar *)Sensor) != 0 &&
                      xmlStrcmp(ftype, (xmlChar *)Indicator) != 0)
                          goto facdone;
  
-                 if (xmlStrcmp(provider, (xmlChar *)"fac_prov_ipmi") != 0) {
-                         topo_dprintf(mp->tm_hdl, TOPO_DBG_XML, "fac_process: "
-                             "Invalid provider attr value: %s\n", provider);
-                         goto facdone;
-                 }
- 
                  if ((ntn = topo_node_facbind(mp, ptn, (char *)fname,
                      (char *)ftype)) == NULL)
                          goto facdone;
  
                  pgi.tpi_name = TOPO_PGROUP_FACILITY;
--- 1432,1441 ----
*** 1461,1472 ****
                                      topo_strerror(err));
                                  return (-1);
                          }
                  }
                  /*
!                  * Invoke enum entry point in fac_prov_ipmi module, which will
!                  * cause the provider methods to be registered on this node
                   */
                  if (fac_enum_run(mp, ntn, (const char *)provider) != 0) {
                          topo_dprintf(mp->tm_hdl, TOPO_DBG_ERR, "fac_process: "
                              "enum entry point failed for provider %s!\n",
                              provider);
--- 1449,1461 ----
                                      topo_strerror(err));
                                  return (-1);
                          }
                  }
                  /*
!                  * Invoke enum entry point in the facility provider module,
!                  * which will cause the provider methods to be registered on
!                  * this node
                   */
                  if (fac_enum_run(mp, ntn, (const char *)provider) != 0) {
                          topo_dprintf(mp->tm_hdl, TOPO_DBG_ERR, "fac_process: "
                              "enum entry point failed for provider %s!\n",
                              provider);