aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/parisc/ccio-dma.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/parisc/ccio-dma.c')
-rw-r--r--drivers/parisc/ccio-dma.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/parisc/ccio-dma.c b/drivers/parisc/ccio-dma.c
index 894fdb9d44c0..b3c4dbff26b8 100644
--- a/drivers/parisc/ccio-dma.c
+++ b/drivers/parisc/ccio-dma.c
@@ -32,6 +32,7 @@
32*/ 32*/
33 33
34#include <linux/types.h> 34#include <linux/types.h>
35#include <linux/kernel.h>
35#include <linux/init.h> 36#include <linux/init.h>
36#include <linux/mm.h> 37#include <linux/mm.h>
37#include <linux/spinlock.h> 38#include <linux/spinlock.h>
@@ -292,7 +293,6 @@ static int ioc_count;
292#define PDIR_INDEX(iovp) ((iovp)>>IOVP_SHIFT) 293#define PDIR_INDEX(iovp) ((iovp)>>IOVP_SHIFT)
293#define MKIOVP(pdir_idx) ((long)(pdir_idx) << IOVP_SHIFT) 294#define MKIOVP(pdir_idx) ((long)(pdir_idx) << IOVP_SHIFT)
294#define MKIOVA(iovp,offset) (dma_addr_t)((long)iovp | (long)offset) 295#define MKIOVA(iovp,offset) (dma_addr_t)((long)iovp | (long)offset)
295#define ROUNDUP(x,y) ((x + ((y)-1)) & ~((y)-1))
296 296
297/* 297/*
298** Don't worry about the 150% average search length on a miss. 298** 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)
668 size_t saved_byte_cnt; 668 size_t saved_byte_cnt;
669 669
670 /* round up to nearest page size */ 670 /* round up to nearest page size */
671 saved_byte_cnt = byte_cnt = ROUNDUP(byte_cnt, IOVP_SIZE); 671 saved_byte_cnt = byte_cnt = ALIGN(byte_cnt, IOVP_SIZE);
672 672
673 while(byte_cnt > 0) { 673 while(byte_cnt > 0) {
674 /* invalidate one page at a time */ 674 /* invalidate one page at a time */
@@ -751,7 +751,7 @@ ccio_map_single(struct device *dev, void *addr, size_t size,
751 offset = ((unsigned long) addr) & ~IOVP_MASK; 751 offset = ((unsigned long) addr) & ~IOVP_MASK;
752 752
753 /* round up to nearest IOVP_SIZE */ 753 /* round up to nearest IOVP_SIZE */
754 size = ROUNDUP(size + offset, IOVP_SIZE); 754 size = ALIGN(size + offset, IOVP_SIZE);
755 spin_lock_irqsave(&ioc->res_lock, flags); 755 spin_lock_irqsave(&ioc->res_lock, flags);
756 756
757#ifdef CCIO_MAP_STATS 757#ifdef CCIO_MAP_STATS
@@ -814,7 +814,7 @@ ccio_unmap_single(struct device *dev, dma_addr_t iova, size_t size,
814 814
815 iova ^= offset; /* clear offset bits */ 815 iova ^= offset; /* clear offset bits */
816 size += offset; 816 size += offset;
817 size = ROUNDUP(size, IOVP_SIZE); 817 size = ALIGN(size, IOVP_SIZE);
818 818
819 spin_lock_irqsave(&ioc->res_lock, flags); 819 spin_lock_irqsave(&ioc->res_lock, flags);
820 820
@@ -1227,7 +1227,7 @@ ccio_get_iotlb_size(struct parisc_device *dev)
1227#endif /* 0 */ 1227#endif /* 0 */
1228 1228
1229/* We *can't* support JAVA (T600). Venture there at your own risk. */ 1229/* We *can't* support JAVA (T600). Venture there at your own risk. */
1230static struct parisc_device_id ccio_tbl[] = { 1230static const struct parisc_device_id ccio_tbl[] = {
1231 { HPHW_IOA, HVERSION_REV_ANY_ID, U2_IOA_RUNWAY, 0xb }, /* U2 */ 1231 { HPHW_IOA, HVERSION_REV_ANY_ID, U2_IOA_RUNWAY, 0xb }, /* U2 */
1232 { HPHW_IOA, HVERSION_REV_ANY_ID, UTURN_IOA_RUNWAY, 0xb }, /* UTurn */ 1232 { HPHW_IOA, HVERSION_REV_ANY_ID, UTURN_IOA_RUNWAY, 0xb }, /* UTurn */
1233 { 0, } 1233 { 0, }
@@ -1370,7 +1370,7 @@ ccio_ioc_init(struct ioc *ioc)
1370 } 1370 }
1371} 1371}
1372 1372
1373static void 1373static void __init
1374ccio_init_resource(struct resource *res, char *name, void __iomem *ioaddr) 1374ccio_init_resource(struct resource *res, char *name, void __iomem *ioaddr)
1375{ 1375{
1376 int result; 1376 int result;
@@ -1537,7 +1537,7 @@ int ccio_request_resource(const struct parisc_device *dev,
1537 * If so, initialize the chip and tell other partners in crime they 1537 * If so, initialize the chip and tell other partners in crime they
1538 * have work to do. 1538 * have work to do.
1539 */ 1539 */
1540static int ccio_probe(struct parisc_device *dev) 1540static int __init ccio_probe(struct parisc_device *dev)
1541{ 1541{
1542 int i; 1542 int i;
1543 struct ioc *ioc, **ioc_p = &ioc_list; 1543 struct ioc *ioc, **ioc_p = &ioc_list;