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 15:39:46 -0400 |
| commit | 725c7b570fda4207e465ff8856c2c12c2645a685 (patch) | |
| tree | ef05a418f09a519190a584581ca85c7ee049cec5 /drivers/ata/ahci_platform.c | |
| parent | e8f781836dc3335b5533f6e177a105bbe3ee7345 (diff) | |
| download | linux-stable-725c7b570fda4207e465ff8856c2c12c2645a685.tar.gz linux-stable-725c7b570fda4207e465ff8856c2c12c2645a685.tar.bz2 linux-stable-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_platform.c')
| -rw-r--r-- | drivers/ata/ahci_platform.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/ata/ahci_platform.c b/drivers/ata/ahci_platform.c index b10d81ddb528..fb3eca5cd66c 100644 --- a/drivers/ata/ahci_platform.c +++ b/drivers/ata/ahci_platform.c @@ -34,7 +34,6 @@ static int ahci_probe(struct platform_device *pdev) struct device *dev = &pdev->dev; struct ahci_platform_data *pdata = dev_get_platdata(dev); struct ahci_host_priv *hpriv; - unsigned long hflags = 0; int rc; hpriv = ahci_platform_get_resources(pdev); @@ -58,10 +57,9 @@ static int ahci_probe(struct platform_device *pdev) } if (of_device_is_compatible(dev->of_node, "hisilicon,hisi-ahci")) - hflags |= AHCI_HFLAG_NO_FBS | AHCI_HFLAG_NO_NCQ; + hpriv->flags |= AHCI_HFLAG_NO_FBS | AHCI_HFLAG_NO_NCQ; - rc = ahci_platform_init_host(pdev, hpriv, &ahci_port_info, - hflags, 0, 0); + rc = ahci_platform_init_host(pdev, hpriv, &ahci_port_info); if (rc) goto pdata_exit; |