diff --git a/arch/arm/mach-stm/speed-imx23.c b/arch/arm/mach-stm/speed-imx23.c index 7418ad5..f32ae92 100644 --- a/arch/arm/mach-stm/speed-imx23.c +++ b/arch/arm/mach-stm/speed-imx23.c @@ -244,8 +244,7 @@ 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 2ad1bfa..1857d6c 100644 --- a/drivers/spi/imx_spi.c +++ b/drivers/spi/imx_spi.c @@ -224,9 +224,6 @@ 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 a14bfc1..be83a31 100644 --- a/include/common.h +++ b/include/common.h @@ -222,4 +222,6 @@ #define IOMEM(addr) ((void __force __iomem *)(addr)) +#define DIV_ROUND_UP(n,d) (((n) + (d) - 1) / (d)) + #endif /* __COMMON_H_ */