PM: Merge the SET*_RUNTIME_PM_OPS() macros
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Wed, 3 Dec 2014 23:34:11 +0000 (00:34 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Wed, 3 Dec 2014 23:51:30 +0000 (00:51 +0100)
commit6ed23b806e73bdd5b17722df507b0f4570c606b6
tree6c03cc156649f8d15eb301a7d86cce3c4840f0a4
parenta1518d3bbc15d89ccf33056ffa8b3a63de118d24
PM: Merge the SET*_RUNTIME_PM_OPS() macros

The SET_PM_RUNTIME_PM_OPS() and SET_RUNTIME_PM_OPS() macros are
identical except that one of them is not empty for CONFIG_PM set,
while the other one is not empty for CONFIG_PM_RUNTIME set,
respectively.

However, after commit b2b49ccbdd54 (PM: Kconfig: Set PM_RUNTIME if
PM_SLEEP is selected) PM_RUNTIME is always set if PM is set, so one
of these macros is now redundant.

For this reason, replace SET_PM_RUNTIME_PM_OPS() with
SET_RUNTIME_PM_OPS() everywhere and redefine the SET_PM_RUNTIME_PM_OPS
symbol as SET_RUNTIME_PM_OPS in case new code is starting to use the
macro being removed here.

Reviewed-by: Ulf Hansson <ulf.hansson@linaro.org>
Acked-by: Kevin Hilman <khilman@linaro.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
drivers/amba/bus.c
drivers/dma/ste_dma40.c
drivers/gpio/gpio-zynq.c
drivers/i2c/busses/i2c-hix5hd2.c
drivers/i2c/busses/i2c-nomadik.c
drivers/mmc/host/mmci.c
drivers/mmc/host/sh_mobile_sdhi.c
drivers/mmc/host/tmio_mmc.c
drivers/spi/spi-pl022.c
include/linux/pm.h