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

Commit 3cb1d958 authored by Milind Arun Choudhary's avatar Milind Arun Choudhary Committed by Kyle McMartin
Browse files

[PARISC] ROUNDUP macro cleanup in drivers/parisc 



Clean up ROUNDUP, Use ALIGN where ever appropriate.

Signed-off-by: default avatarMilind Arun Choudhary <milindchoudhary@gmail.com>
Acked-by: default avatarGrant Grundler <grundler@parisc-linux.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarKyle McMartin <kyle@parisc-linux.org>
parent ea743429

drivers/parisc/ccio-dma.c

+4 −4
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ 
*/



#include <linux/types.h>

#include <linux/kernel.h>

#include <linux/init.h>

#include <linux/mm.h>

#include <linux/spinlock.h>
@@ -292,7 +293,6 @@ static int ioc_count; 
#define PDIR_INDEX(iovp)    ((iovp)>>IOVP_SHIFT)

#define MKIOVP(pdir_idx)    ((long)(pdir_idx) << IOVP_SHIFT)

#define MKIOVA(iovp,offset) (dma_addr_t)((long)iovp | (long)offset)

#define ROUNDUP(x,y) ((x + ((y)-1)) & ~((y)-1))



/*

** Don't worry about the 150% average search length on a miss.
@@ -668,7 +668,7 @@ ccio_mark_invalid(struct ioc *ioc, dma_addr_t iova, size_t byte_cnt) 
	size_t saved_byte_cnt;



	/* round up to nearest page size */

	saved_byte_cnt = byte_cnt = ROUNDUP(byte_cnt, IOVP_SIZE);

	saved_byte_cnt = byte_cnt = ALIGN(byte_cnt, IOVP_SIZE);



	while(byte_cnt > 0) {

		/* invalidate one page at a time */
@@ -751,7 +751,7 @@ ccio_map_single(struct device *dev, void *addr, size_t size, 
	offset = ((unsigned long) addr) & ~IOVP_MASK;



	/* round up to nearest IOVP_SIZE */

	size = ROUNDUP(size + offset, IOVP_SIZE);

	size = ALIGN(size + offset, IOVP_SIZE);

	spin_lock_irqsave(&ioc->res_lock, flags);



#ifdef CCIO_MAP_STATS
@@ -814,7 +814,7 @@ ccio_unmap_single(struct device *dev, dma_addr_t iova, size_t size, 


	iova ^= offset;        /* clear offset bits */

	size += offset;

	size = ROUNDUP(size, IOVP_SIZE);

	size = ALIGN(size, IOVP_SIZE);



	spin_lock_irqsave(&ioc->res_lock, flags);

drivers/parisc/iommu-helpers.h

+2 −2
Original line number Diff line number Diff line
@@ -138,7 +138,7 @@ iommu_coalesce_chunks(struct ioc *ioc, struct scatterlist *startsg, int nents, 
			** exceed DMA_CHUNK_SIZE if we coalesce the

			** next entry.

			*/   

			if(unlikely(ROUNDUP(dma_len + dma_offset + startsg->length,

			if(unlikely(ALIGN(dma_len + dma_offset + startsg->length,

					    IOVP_SIZE) > DMA_CHUNK_SIZE))

				break;
@@ -158,7 +158,7 @@ iommu_coalesce_chunks(struct ioc *ioc, struct scatterlist *startsg, int nents, 
		** Allocate space for DMA stream.

		*/

		sg_dma_len(contig_sg) = dma_len;

		dma_len = ROUNDUP(dma_len + dma_offset, IOVP_SIZE);

		dma_len = ALIGN(dma_len + dma_offset, IOVP_SIZE);

		sg_dma_address(contig_sg) =

			PIDE_FLAG 

			| (iommu_alloc_range(ioc, dma_len) << IOVP_SHIFT)

drivers/parisc/sba_iommu.c

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