Skip to content

Commit

Permalink
spi: pl022: Let runtime PM callbacks be available for CONFIG_PM
Browse files Browse the repository at this point in the history
Convert to the SET_PM_RUNTIME_PM macro while defining the runtime PM
callbacks. This means the callbacks becomes available for both
CONFIG_PM_SLEEP and CONFIG_PM_RUNTIME, which is needed to handle the
combinations of these scenarios.

Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Mark Brown <broonie@linaro.org>
  • Loading branch information
Ulf Hansson authored and Mark Brown committed Mar 6, 2014
1 parent e37912f commit 736198b
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions drivers/spi/spi-pl022.c
Original file line number Diff line number Diff line change
Expand Up @@ -2277,7 +2277,7 @@ pl022_remove(struct amba_device *adev)
return 0;
}

#if defined(CONFIG_SUSPEND) || defined(CONFIG_PM_RUNTIME)
#ifdef CONFIG_PM
/*
* These two functions are used from both suspend/resume and
* the runtime counterparts to handle external resources like
Expand Down Expand Up @@ -2343,7 +2343,7 @@ static int pl022_resume(struct device *dev)
}
#endif /* CONFIG_PM */

#ifdef CONFIG_PM_RUNTIME
#ifdef CONFIG_PM
static int pl022_runtime_suspend(struct device *dev)
{
struct pl022 *pl022 = dev_get_drvdata(dev);
Expand All @@ -2363,7 +2363,7 @@ static int pl022_runtime_resume(struct device *dev)

static const struct dev_pm_ops pl022_dev_pm_ops = {
SET_SYSTEM_SLEEP_PM_OPS(pl022_suspend, pl022_resume)
SET_RUNTIME_PM_OPS(pl022_runtime_suspend, pl022_runtime_resume, NULL)
SET_PM_RUNTIME_PM_OPS(pl022_runtime_suspend, pl022_runtime_resume, NULL)
};

static struct vendor_data vendor_arm = {
Expand Down

0 comments on commit 736198b

Please sign in to comment.