Commit 25d490eb authored by Wang Kefeng's avatar Wang Kefeng Committed by Russell King (Oracle)
Browse files

ARM: 9172/1: amba: Cleanup amba pclk operation 



There is no user about amba_pclk_[un]prepare() besides pl330.c,
directly use clk_[un]prepare(). After this, all the function about
amba pclk operation, enable, disable, [un]prepare could be killed.

Acked-by: default avatarVinod Koul <vkoul@kernel.org>
Signed-off-by: default avatarKefeng Wang <wangkefeng.wang@huawei.com>
Signed-off-by: default avatarRussell King (Oracle) <rmk+kernel@armlinux.org.uk>
parent e783362e

drivers/dma/pl330.c

+2 −2
Original line number Diff line number Diff line
@@ -2968,7 +2968,7 @@ static int __maybe_unused pl330_suspend(struct device *dev) 
	struct amba_device *pcdev = to_amba_device(dev);



	pm_runtime_force_suspend(dev);

	amba_pclk_unprepare(pcdev);

	clk_unprepare(pcdev->pclk);



	return 0;

}
@@ -2978,7 +2978,7 @@ static int __maybe_unused pl330_resume(struct device *dev) 
	struct amba_device *pcdev = to_amba_device(dev);

	int ret;



	ret = amba_pclk_prepare(pcdev);

	ret = clk_prepare(pcdev->pclk);

	if (ret)

		return ret;

include/linux/amba/bus.h

+0 −20
Original line number Diff line number Diff line
@@ -121,26 +121,6 @@ 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 *);



static inline int amba_pclk_enable(struct amba_device *dev)

{

	return clk_enable(dev->pclk);

}



static inline void amba_pclk_disable(struct amba_device *dev)

{

	clk_disable(dev->pclk);

}



static inline int amba_pclk_prepare(struct amba_device *dev)

{

	return clk_prepare(dev->pclk);

}



static inline void amba_pclk_unprepare(struct amba_device *dev)

{

	clk_unprepare(dev->pclk);

}



/* Some drivers don't use the struct amba_device */

#define AMBA_CONFIG_BITS(a) (((a) >> 24) & 0xff)

#define AMBA_REV_BITS(a) (((a) >> 20) & 0x0f)