diff options
author | Kefeng Wang <kefeng.wang@linaro.org> | 2014-05-14 02:13:41 -0400 |
---|---|---|
committer | Tejun Heo <tj@kernel.org> | 2014-05-14 13:07:10 -0400 |
commit | f9f36917903b57c571b1ddcfc6bc794ca4dd8232 (patch) | |
tree | cbabd67e07fd49de26f8ce42adba490eddaca77e /drivers/ata/ahci_xgene.c | |
parent | 888d91a08fa8e2be4cb0eef1e5736ef68b8f77f0 (diff) |
libahci_platform: add host_flags parameter in ahci_platform_init_host()
Add a dynamic host_flags argument to make ahci_platform_init_host more flexible,
then remove the AHCI_HFLAGS(...) argument from some driver's ata_port_info,
and pass that in as the new argument.
Cc: Hans de Geode <hdegoede@redhat.com>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Kefeng Wang <kefeng.wang@linaro.org>
Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'drivers/ata/ahci_xgene.c')
-rw-r--r-- | drivers/ata/ahci_xgene.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/ata/ahci_xgene.c b/drivers/ata/ahci_xgene.c index 77c89bf171f1..042a9bb45c86 100644 --- a/drivers/ata/ahci_xgene.c +++ b/drivers/ata/ahci_xgene.c | |||
@@ -303,7 +303,6 @@ static struct ata_port_operations xgene_ahci_ops = { | |||
303 | }; | 303 | }; |
304 | 304 | ||
305 | static const struct ata_port_info xgene_ahci_port_info = { | 305 | static const struct ata_port_info xgene_ahci_port_info = { |
306 | AHCI_HFLAGS(AHCI_HFLAG_NO_PMP | AHCI_HFLAG_YES_NCQ), | ||
307 | .flags = AHCI_FLAG_COMMON | ATA_FLAG_NCQ, | 306 | .flags = AHCI_FLAG_COMMON | ATA_FLAG_NCQ, |
308 | .pio_mask = ATA_PIO4, | 307 | .pio_mask = ATA_PIO4, |
309 | .udma_mask = ATA_UDMA6, | 308 | .udma_mask = ATA_UDMA6, |
@@ -382,6 +381,7 @@ static int xgene_ahci_probe(struct platform_device *pdev) | |||
382 | struct ahci_host_priv *hpriv; | 381 | struct ahci_host_priv *hpriv; |
383 | struct xgene_ahci_context *ctx; | 382 | struct xgene_ahci_context *ctx; |
384 | struct resource *res; | 383 | struct resource *res; |
384 | unsigned long hflags; | ||
385 | int rc; | 385 | int rc; |
386 | 386 | ||
387 | hpriv = ahci_platform_get_resources(pdev); | 387 | hpriv = ahci_platform_get_resources(pdev); |
@@ -450,7 +450,10 @@ static int xgene_ahci_probe(struct platform_device *pdev) | |||
450 | goto disable_resources; | 450 | goto disable_resources; |
451 | } | 451 | } |
452 | 452 | ||
453 | rc = ahci_platform_init_host(pdev, hpriv, &xgene_ahci_port_info, 0, 0); | 453 | hflags = AHCI_HFLAG_NO_PMP | AHCI_HFLAG_YES_NCQ; |
454 | |||
455 | rc = ahci_platform_init_host(pdev, hpriv, &xgene_ahci_port_info, | ||
456 | hflags, 0, 0); | ||
454 | if (rc) | 457 | if (rc) |
455 | goto disable_resources; | 458 | goto disable_resources; |
456 | 459 | ||