diff options
author | Antoine Ténart <antoine.tenart@free-electrons.com> | 2014-07-30 14:13:56 -0400 |
---|---|---|
committer | Tejun Heo <tj@kernel.org> | 2014-07-30 15:39:46 -0400 |
commit | 725c7b570fda4207e465ff8856c2c12c2645a685 (patch) | |
tree | ef05a418f09a519190a584581ca85c7ee049cec5 /drivers/ata/ahci_xgene.c | |
parent | e8f781836dc3335b5533f6e177a105bbe3ee7345 (diff) |
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_xgene.c')
-rw-r--r-- | drivers/ata/ahci_xgene.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/ata/ahci_xgene.c b/drivers/ata/ahci_xgene.c index 1cfbdca638d2..bc281115490b 100644 --- a/drivers/ata/ahci_xgene.c +++ b/drivers/ata/ahci_xgene.c | |||
@@ -422,7 +422,6 @@ static int xgene_ahci_probe(struct platform_device *pdev) | |||
422 | struct ahci_host_priv *hpriv; | 422 | struct ahci_host_priv *hpriv; |
423 | struct xgene_ahci_context *ctx; | 423 | struct xgene_ahci_context *ctx; |
424 | struct resource *res; | 424 | struct resource *res; |
425 | unsigned long hflags; | ||
426 | int rc; | 425 | int rc; |
427 | 426 | ||
428 | hpriv = ahci_platform_get_resources(pdev); | 427 | hpriv = ahci_platform_get_resources(pdev); |
@@ -481,10 +480,9 @@ static int xgene_ahci_probe(struct platform_device *pdev) | |||
481 | /* Configure the host controller */ | 480 | /* Configure the host controller */ |
482 | xgene_ahci_hw_init(hpriv); | 481 | xgene_ahci_hw_init(hpriv); |
483 | 482 | ||
484 | hflags = AHCI_HFLAG_NO_PMP | AHCI_HFLAG_YES_NCQ; | 483 | hpriv->flags = AHCI_HFLAG_NO_PMP | AHCI_HFLAG_YES_NCQ; |
485 | 484 | ||
486 | rc = ahci_platform_init_host(pdev, hpriv, &xgene_ahci_port_info, | 485 | rc = ahci_platform_init_host(pdev, hpriv, &xgene_ahci_port_info); |
487 | hflags, 0, 0); | ||
488 | if (rc) | 486 | if (rc) |
489 | goto disable_resources; | 487 | goto disable_resources; |
490 | 488 | ||