diff options
| author | Juergen Beisert <jbe@pengutronix.de> | 2010-12-13 11:53:24 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2010-12-14 15:15:06 +0100 |
| commit | f9a11ecfef1983b33a619d7eab479c8390c2838d (patch) | |
| tree | 0ca78d0dff933b7f491f600a917f39673b6e1eaf | |
| parent | b08d7dfecf0c9078a1c22171a02a0e401a292e37 (diff) | |
| download | barebox-f9a11ecfef1983b33a619d7eab479c8390c2838d.tar.gz barebox-f9a11ecfef1983b33a619d7eab479c8390c2838d.tar.xz | |
Make DIV_ROUND_UP macro globally available
Signed-off-by: Juergen Beisert <jbe@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| -rw-r--r-- | arch/arm/mach-stm/speed-imx23.c | 3 | ||||
| -rw-r--r-- | drivers/spi/imx_spi.c | 3 | ||||
| -rw-r--r-- | include/common.h | 2 |
3 files changed, 3 insertions, 5 deletions
diff --git a/arch/arm/mach-stm/speed-imx23.c b/arch/arm/mach-stm/speed-imx23.c index 7418ad57..f32ae92a 100644 --- a/arch/arm/mach-stm/speed-imx23.c +++ b/arch/arm/mach-stm/speed-imx23.c @@ -244,8 +244,7 @@ unsigned imx_set_sspclk(unsigned index, unsigned nc, int high) printf("Cannot setup SSP unit clock to %u Hz, base clock is only %u Hz\n", nc, ssp_div); ssp_div = 1U; } else { - ssp_div += nc - 1U; - ssp_div /= nc; + ssp_div = DIV_ROUND_UP(ssp_div, nc); if (ssp_div > CLKCTRL_SSP_DIV_MASK) ssp_div = CLKCTRL_SSP_DIV_MASK; } diff --git a/drivers/spi/imx_spi.c b/drivers/spi/imx_spi.c index 2ad1bfa4..1857d6c6 100644 --- a/drivers/spi/imx_spi.c +++ b/drivers/spi/imx_spi.c @@ -224,9 +224,6 @@ static unsigned int cspi_2_3_xchg_single(struct imx_spi *imx, unsigned int data) return readl(base + CSPI_2_3_RXDATA); } -/* FIXME: include/linux/kernel.h */ -#define DIV_ROUND_UP(n,d) (((n) + (d) - 1) / (d)) - static unsigned int cspi_2_3_clkdiv(unsigned int fin, unsigned int fspi) { /* diff --git a/include/common.h b/include/common.h index a14bfc10..be83a31a 100644 --- a/include/common.h +++ b/include/common.h @@ -222,4 +222,6 @@ extern const char version_string[]; #define IOMEM(addr) ((void __force __iomem *)(addr)) +#define DIV_ROUND_UP(n,d) (((n) + (d) - 1) / (d)) + #endif /* __COMMON_H_ */ |