lkml.org 
[lkml]   [2010]   [Mar]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH 04/11] ahci: Factor out PCI specifics from ahci_reset_controller()
    Move PCI stuff into ahci_pci_reset_controller().

    Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
    ---
    drivers/ata/ahci.c | 15 ++++++++++++---
    1 files changed, 12 insertions(+), 3 deletions(-)

    diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c
    index 9d9af3c..830a6fe 100644
    --- a/drivers/ata/ahci.c
    +++ b/drivers/ata/ahci.c
    @@ -1343,7 +1343,6 @@ static int ahci_deinit_port(struct ata_port *ap, const char **emsg)

    static int ahci_reset_controller(struct ata_host *host)
    {
    - struct pci_dev *pdev = to_pci_dev(host->dev);
    struct ahci_host_priv *hpriv = host->private_data;
    void __iomem *mmio = hpriv->mmio;
    u32 tmp;
    @@ -1387,7 +1386,17 @@ static int ahci_reset_controller(struct ata_host *host)
    dev_printk(KERN_INFO, host->dev,
    "skipping global host reset\n");

    + return 0;
    +}
    +
    +static int ahci_pci_reset_controller(struct ata_host *host)
    +{
    + struct pci_dev *pdev = to_pci_dev(host->dev);
    +
    + ahci_reset_controller(host);
    +
    if (pdev->vendor == PCI_VENDOR_ID_INTEL) {
    + struct ahci_host_priv *hpriv = host->private_data;
    u16 tmp16;

    /* configure PCS */
    @@ -2670,7 +2679,7 @@ static int ahci_pci_device_resume(struct pci_dev *pdev)
    return rc;

    if (pdev->dev.power.power_state.event == PM_EVENT_SUSPEND) {
    - rc = ahci_reset_controller(host);
    + rc = ahci_pci_reset_controller(host);
    if (rc)
    return rc;

    @@ -3398,7 +3407,7 @@ static int ahci_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
    if (rc)
    return rc;

    - rc = ahci_reset_controller(host);
    + rc = ahci_pci_reset_controller(host);
    if (rc)
    return rc;

    --
    1.7.0


    \
     
     \ /
      Last update: 2010-03-03 18:19    [W:0.035 / U:120.588 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site