Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 67c2b9cb authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski Committed by Russell King
Browse files

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: default avatarKrzysztof Kozlowski <k.kozlowski@samsung.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent c2563038

include/linux/amba/bus.h

+8 −4
Original line number Diff line number Diff line
@@ -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)

{