lkml.org 
[lkml]   [2009]   [Mar]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 6/11] PCI PM: Consistently use variable name "error" for pm call return values
    Date
    From: Frans Pop <elendil@planet.nl>

    I noticed two functions use a variable "i" to store the return value of PM
    function calls while the rest of the file uses "error". As "i" normally
    indicates a counter of some sort it seems better to keep this consistent.

    Signed-off-by: Frans Pop <elendil@planet.nl>
    Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
    Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
    ---
    drivers/pci/pci-driver.c | 20 ++++++++++----------
    1 file changed, 10 insertions(+), 10 deletions(-)

    Index: linux-2.6/drivers/pci/pci-driver.c
    ===================================================================
    --- linux-2.6.orig/drivers/pci/pci-driver.c
    +++ linux-2.6/drivers/pci/pci-driver.c
    @@ -352,17 +352,17 @@ static int pci_legacy_suspend(struct dev
    {
    struct pci_dev * pci_dev = to_pci_dev(dev);
    struct pci_driver * drv = pci_dev->driver;
    - int i = 0;
    + int error = 0;

    if (drv && drv->suspend) {
    pci_power_t prev = pci_dev->current_state;

    pci_dev->state_saved = false;

    - i = drv->suspend(pci_dev, state);
    - suspend_report_result(drv->suspend, i);
    - if (i)
    - return i;
    + error = drv->suspend(pci_dev, state);
    + suspend_report_result(drv->suspend, error);
    + if (error)
    + return error;

    if (pci_dev->state_saved)
    goto Fixup;
    @@ -385,20 +385,20 @@ static int pci_legacy_suspend(struct dev
    Fixup:
    pci_fixup_device(pci_fixup_suspend, pci_dev);

    - return i;
    + return error;
    }

    static int pci_legacy_suspend_late(struct device *dev, pm_message_t state)
    {
    struct pci_dev * pci_dev = to_pci_dev(dev);
    struct pci_driver * drv = pci_dev->driver;
    - int i = 0;
    + int error = 0;

    if (drv && drv->suspend_late) {
    - i = drv->suspend_late(pci_dev, state);
    - suspend_report_result(drv->suspend_late, i);
    + error = drv->suspend_late(pci_dev, state);
    + suspend_report_result(drv->suspend_late, error);
    }
    - return i;
    + return error;
    }

    static int pci_legacy_resume_early(struct device *dev)

    \
     
     \ /
      Last update: 2009-03-14 12:41    [W:0.022 / U:119.316 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site