diff options
author | Antoine Ténart <antoine.tenart@free-electrons.com> | 2014-07-30 20:13:56 +0200 |
---|---|---|
committer | Tejun Heo <tj@kernel.org> | 2014-07-30 21:39:46 +0200 |
commit | 725c7b570fda4207e465ff8856c2c12c2645a685 (patch) | |
tree | ef05a418f09a519190a584581ca85c7ee049cec5 /drivers/ata/ahci_imx.c | |
parent | Merge branch 'for-3.16-fixes' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
download | linux-725c7b570fda4207e465ff8856c2c12c2645a685.tar.xz linux-725c7b570fda4207e465ff8856c2c12c2645a685.zip |
ata: libahci_platform: move port_map parameters into the AHCI structure
This patch moves force_port_map and mask_port_map into the
ahci_host_priv structure. This allows to modify them into the AHCI
framework. This is needed by the new dt bindings representing ports as
the port_map mask is computed automatically.
Parameters modifying force_port_map, mask_port_map and flags have been
removed from the ahci_platform_init_host() function, and inputs in the
ahci_host_priv structure are now directly filed.
Signed-off-by: Antoine Ténart <antoine.tenart@free-electrons.com>
Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'drivers/ata/ahci_imx.c')
-rw-r--r-- | drivers/ata/ahci_imx.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/ata/ahci_imx.c b/drivers/ata/ahci_imx.c index 1e5fa5f21aff..f3970b4ed889 100644 --- a/drivers/ata/ahci_imx.c +++ b/drivers/ata/ahci_imx.c @@ -620,8 +620,7 @@ static int imx_ahci_probe(struct platform_device *pdev) reg_val = clk_get_rate(imxpriv->ahb_clk) / 1000; writel(reg_val, hpriv->mmio + IMX_TIMER1MS); - ret = ahci_platform_init_host(pdev, hpriv, &ahci_imx_port_info, - 0, 0, 0); + ret = ahci_platform_init_host(pdev, hpriv, &ahci_imx_port_info); if (ret) goto disable_sata; |