lkml.org 
[lkml]   [2006]   [Dec]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Subject[PATCH 7/12] libata: handle pci_enable_device() failure while resuming
    Date
    From
    Handle pci_enable_device() failure while resuming.  This patch kills
    the "ignoring return value of 'pci_enable_device'" warning message and
    propagates __must_check through ata_pci_device_do_resume().

    Signed-off-by: Tejun Heo <htejun@gmail.com>
    ---
    drivers/ata/ahci.c | 4 +++-
    drivers/ata/libata-core.c | 22 +++++++++++++++++-----
    drivers/ata/sata_sil.c | 6 +++++-
    drivers/ata/sata_sil24.c | 5 ++++-
    include/linux/libata.h | 2 +-
    5 files changed, 30 insertions(+), 9 deletions(-)

    diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c
    index b517d24..0656334 100644
    --- a/drivers/ata/ahci.c
    +++ b/drivers/ata/ahci.c
    @@ -1372,7 +1372,9 @@ static int ahci_pci_device_resume(struct pci_dev *pdev)
    void __iomem *mmio = host->mmio_base;
    int rc;

    - ata_pci_device_do_resume(pdev);
    + rc = ata_pci_device_do_resume(pdev);
    + if (rc)
    + return rc;

    if (pdev->dev.power.power_state.event == PM_EVENT_SUSPEND) {
    rc = ahci_reset_controller(mmio, pdev);
    diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
    index 0d51d13..5fdf37f 100644
    --- a/drivers/ata/libata-core.c
    +++ b/drivers/ata/libata-core.c
    @@ -6221,12 +6221,22 @@ void ata_pci_device_do_suspend(struct pci_dev *pdev, pm_message_t mesg)
    }
    }

    -void ata_pci_device_do_resume(struct pci_dev *pdev)
    +int ata_pci_device_do_resume(struct pci_dev *pdev)
    {
    + int rc;
    +
    pci_set_power_state(pdev, PCI_D0);
    pci_restore_state(pdev);
    - pci_enable_device(pdev);
    +
    + rc = pci_enable_device(pdev);
    + if (rc) {
    + dev_printk(KERN_ERR, &pdev->dev,
    + "failed to enable device after resume (%d)\n", rc);
    + return rc;
    + }
    +
    pci_set_master(pdev);
    + return 0;
    }

    int ata_pci_device_suspend(struct pci_dev *pdev, pm_message_t mesg)
    @@ -6246,10 +6256,12 @@ int ata_pci_device_suspend(struct pci_dev *pdev, pm_message_t mesg)
    int ata_pci_device_resume(struct pci_dev *pdev)
    {
    struct ata_host *host = dev_get_drvdata(&pdev->dev);
    + int rc;

    - ata_pci_device_do_resume(pdev);
    - ata_host_resume(host);
    - return 0;
    + rc = ata_pci_device_do_resume(pdev);
    + if (rc == 0)
    + ata_host_resume(host);
    + return rc;
    }
    #endif /* CONFIG_PCI */

    diff --git a/drivers/ata/sata_sil.c b/drivers/ata/sata_sil.c
    index 7808d03..ca7111a 100644
    --- a/drivers/ata/sata_sil.c
    +++ b/drivers/ata/sata_sil.c
    @@ -710,8 +710,12 @@ err_out:
    static int sil_pci_device_resume(struct pci_dev *pdev)
    {
    struct ata_host *host = dev_get_drvdata(&pdev->dev);
    + int rc;
    +
    + rc = ata_pci_device_do_resume(pdev);
    + if (rc)
    + return rc;

    - ata_pci_device_do_resume(pdev);
    sil_init_controller(pdev, host->n_ports, host->ports[0]->flags,
    host->mmio_base);
    ata_host_resume(host);
    diff --git a/drivers/ata/sata_sil24.c b/drivers/ata/sata_sil24.c
    index 5aa288d..da982ed 100644
    --- a/drivers/ata/sata_sil24.c
    +++ b/drivers/ata/sata_sil24.c
    @@ -1200,8 +1200,11 @@ static int sil24_pci_device_resume(struct pci_dev *pdev)
    {
    struct ata_host *host = dev_get_drvdata(&pdev->dev);
    struct sil24_host_priv *hpriv = host->private_data;
    + int rc;

    - ata_pci_device_do_resume(pdev);
    + rc = ata_pci_device_do_resume(pdev);
    + if (rc)
    + return rc;

    if (pdev->dev.power.power_state.event == PM_EVENT_SUSPEND)
    writel(HOST_CTRL_GLOBAL_RST, hpriv->host_base + HOST_CTRL);
    diff --git a/include/linux/libata.h b/include/linux/libata.h
    index ab27548..8028a57 100644
    --- a/include/linux/libata.h
    +++ b/include/linux/libata.h
    @@ -719,7 +719,7 @@ extern int ata_pci_init_one (struct pci_dev *pdev, struct ata_port_info **port_i
    unsigned int n_ports);
    extern void ata_pci_remove_one (struct pci_dev *pdev);
    extern void ata_pci_device_do_suspend(struct pci_dev *pdev, pm_message_t mesg);
    -extern void ata_pci_device_do_resume(struct pci_dev *pdev);
    +extern int __must_check ata_pci_device_do_resume(struct pci_dev *pdev);
    extern int ata_pci_device_suspend(struct pci_dev *pdev, pm_message_t mesg);
    extern int ata_pci_device_resume(struct pci_dev *pdev);
    extern int ata_pci_clear_simplex(struct pci_dev *pdev);
    --
    1.4.4.2

    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2006-12-26 16:25    [W:0.029 / U:0.316 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site