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>

1 files changed, 3 insertions, 5 deletions

diff --git a/drivers/ata/ahci_sunxi.c b/drivers/ata/ahci_sunxi.c
index 02002f125bd4..e44d675a30ec 100644
--- a/drivers/ata/ahci_sunxi.c
+++ b/drivers/ata/ahci_sunxi.c
@@ -167,7 +167,6 @@ static int ahci_sunxi_probe(struct platform_device *pdev)
 {
         struct device *dev = &pdev->dev;
         struct ahci_host_priv *hpriv;
-        unsigned long hflags;
         int rc;
 
         hpriv = ahci_platform_get_resources(pdev);
@@ -184,11 +183,10 @@ static int ahci_sunxi_probe(struct platform_device *pdev)
         if (rc)
                 goto disable_resources;
 
-        hflags = AHCI_HFLAG_32BIT_ONLY | AHCI_HFLAG_NO_MSI |
-                 AHCI_HFLAG_NO_PMP | AHCI_HFLAG_YES_NCQ;
+        hpriv->flags = AHCI_HFLAG_32BIT_ONLY | AHCI_HFLAG_NO_MSI |
+                       AHCI_HFLAG_NO_PMP | AHCI_HFLAG_YES_NCQ;
 
-        rc = ahci_platform_init_host(pdev, hpriv, &ahci_sunxi_port_info,
-                                     hflags, 0, 0);
+        rc = ahci_platform_init_host(pdev, hpriv, &ahci_sunxi_port_info);
         if (rc)
                 goto disable_resources;