diff options
| author |   Krzysztof Kozlowski <k.kozlowski@samsung.com> | 2014-11-18 12:18:18 +0100 |
|---|---|---|
| committer |   Russell King <rmk+kernel@arm.linux.org.uk> | 2015-01-16 14:52:03 +0000 |
| commit | 67c2b9cb30f561325b010e046b7bbe2a327e69a0 (patch) | |
| tree | a3e85353590cf62abade08955ab01a10cf6b2ade /include/linux/amba | |
| parent | ARM: 8285/1: remove ARMv3 user access code again (diff) | |
| download | wireguard-linux-67c2b9cb30f561325b010e046b7bbe2a327e69a0.tar.xz wireguard-linux-67c2b9cb30f561325b010e046b7bbe2a327e69a0.zip | |
ARM: 8207/1: amba: Use inlines instead of macros for amba_pclk_enable/disable
Replace the amba_pclk_enable and amba_pclk_disable macros with static
inline functions and remove checks for IS_ERR. The amba bus clock won't
be ERR because probe would fail before the use of these functions.
Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'include/linux/amba')
| -rw-r--r-- | include/linux/amba/bus.h | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/include/linux/amba/bus.h b/include/linux/amba/bus.h index 2afc618b15ce..0ab5f8e0dea2 100644 --- a/include/linux/amba/bus.h +++ b/include/linux/amba/bus.h @@ -92,11 +92,15 @@ struct amba_device *amba_find_device(const char *, struct device *, unsigned int int amba_request_regions(struct amba_device *, const char *); void amba_release_regions(struct amba_device *); -#define amba_pclk_enable(d) \ - (IS_ERR((d)->pclk) ? 0 : clk_enable((d)->pclk)) +static inline int amba_pclk_enable(struct amba_device *dev) +{ + return clk_enable(dev->pclk); +} -#define amba_pclk_disable(d) \ - do { if (!IS_ERR((d)->pclk)) clk_disable((d)->pclk); } while (0) +static inline void amba_pclk_disable(struct amba_device *dev) +{ + clk_disable(dev->pclk); +} static inline int amba_pclk_prepare(struct amba_device *dev) { |