[PARISC] ROUNDUP macro cleanup in drivers/parisc
Clean up ROUNDUP, Use ALIGN where ever appropriate. Signed-off-by: Milind Arun Choudhary <milindchoudhary@gmail.com> Acked-by: Grant Grundler <grundler@parisc-linux.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
This commit is contained in:
committed by
Kyle McMartin
parent
ea74342900
commit
3cb1d95847
@@ -113,8 +113,6 @@ module_param(sba_reserve_agpgart, int, 0444);
|
||||
MODULE_PARM_DESC(sba_reserve_agpgart, "Reserve half of IO pdir as AGPGART");
|
||||
#endif
|
||||
|
||||
#define ROUNDUP(x,y) ((x + ((y)-1)) & ~((y)-1))
|
||||
|
||||
|
||||
/************************************
|
||||
** SBA register read and write support
|
||||
@@ -352,7 +350,7 @@ sba_search_bitmap(struct ioc *ioc, unsigned long bits_wanted)
|
||||
** SBA HW features in the unmap path.
|
||||
*/
|
||||
unsigned long o = 1 << get_order(bits_wanted << PAGE_SHIFT);
|
||||
uint bitshiftcnt = ROUNDUP(ioc->res_bitshift, o);
|
||||
uint bitshiftcnt = ALIGN(ioc->res_bitshift, o);
|
||||
unsigned long mask;
|
||||
|
||||
if (bitshiftcnt >= BITS_PER_LONG) {
|
||||
@@ -779,7 +777,7 @@ sba_unmap_single(struct device *dev, dma_addr_t iova, size_t size,
|
||||
offset = iova & ~IOVP_MASK;
|
||||
iova ^= offset; /* clear offset bits */
|
||||
size += offset;
|
||||
size = ROUNDUP(size, IOVP_SIZE);
|
||||
size = ALIGN(size, IOVP_SIZE);
|
||||
|
||||
spin_lock_irqsave(&ioc->res_lock, flags);
|
||||
|
||||
|
Reference in New Issue
Block a user