(Cc'ing Hans.) On Mon, Jul 07, 2014 at 12:16:09PM +0200, Antoine Ténart wrote: > @@ -482,6 +482,13 @@ void ahci_save_initial_config(struct device *dev, > port_map &= mask_port_map; > } > > + /* > + * If port_map was filled automatically when finding port sub-nodes, > + * make sure we get the right set here. > + */ > + if (hpriv->port_map) > + port_map &= hpriv->port_map; > + So, hpriv->port is both input and output? This is messy and can lead to confusing failures and there now are multiple ways to modify port_map. If carrying this information through ahci_host_priv is necessary, let's remove the direct params and introduce new input fields to the struct. > /** > + * ahci_platform_enable_phys - Enable PHYs > + * @hpriv: host private area to store config values > + * > + * This function enables all the PHYs found in hpriv->phys, if any. > + * If a PHY fails to be enabled, it disables all the PHYs already > + * enabled in reverse order and returns an error. > + * > + * RETURNS: > + * 0 on success otherwise a negative error code > + */ > +int ahci_platform_enable_phys(struct ahci_host_priv *hpriv) > +{ > + int i, rc = 0; > + > + for (i = 0; i < hpriv->nphys; i++) { > + rc = phy_init(hpriv->phys[i]); > + if (rc) > + goto disable_phys; > + > + rc = phy_power_on(hpriv->phys[i]); > + if (rc) { > + phy_exit(hpriv->phys[i]); > + goto disable_phys; > + } > + } > + > + return 0; > + > +disable_phys: > + while (--i >= 0) { > + phy_power_off(hpriv->phys[i]); > + phy_exit(hpriv->phys[i]); > + } > + return rc; > +} > +EXPORT_SYMBOL_GPL(ahci_platform_enable_phys); Do we need to make hpriv->phys[] dynamically allocated? We already have hpriv->clks[AHCI_MAX_CLKS] and it's unlikely that we're gonna need more than several phys per host. Let's go with a simpler fixed array. Thanks. -- tejun -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html