From d752ee23c4f0db5edd5c1ac686c8871174ff8ffc Mon Sep 17 00:00:00 2001 From: Russell King Date: Wed, 5 Dec 2012 11:43:57 +0000 Subject: Remove unused bmm_get_kern_paddr() function Userspace should not be dealing with kernel space addresses at all. Thankfully this function is unused, so we can merely delete it. --- bmm_lib.c | 19 ------------------- bmm_lib.h | 1 - debian/changelog | 1 + 3 files changed, 1 insertion(+), 20 deletions(-) diff --git a/bmm_lib.c b/bmm_lib.c index 4def40b..d92ca39 100644 --- a/bmm_lib.c +++ b/bmm_lib.c @@ -149,25 +149,6 @@ void *bmm_get_vaddr(unsigned long paddr) return (void *)io.output; } -unsigned long bmm_get_kern_paddr(void *vaddr, unsigned long size) -{ - int ret; - ioctl_arg_t io; - - if(bmm_init() < 0) - return 0; - - io.input = (unsigned long)vaddr; - io.length = (unsigned long)size; - io.output = 0; - io.arg = 0; - ret = ioctl(bmm_fd, BMM_GET_KERN_PHYS_ADDR, &io); - if(ret < 0) - return 0; - - return io.output; -} - unsigned long bmm_get_paddr(void *vaddr) { int ret; diff --git a/bmm_lib.h b/bmm_lib.h index f8c160b..14af196 100644 --- a/bmm_lib.h +++ b/bmm_lib.h @@ -47,7 +47,6 @@ void *bmm_attach(unsigned long paddr, unsigned long len); void bmm_detach(void *vaddr, unsigned long len); void *bmm_get_vaddr(unsigned long paddr); unsigned long bmm_get_paddr(void *vaddr); -unsigned long bmm_get_kern_paddr(void *vaddr, unsigned long size); int bmm_get_mem_attr(void *vaddr); int bmm_set_mem_attr(void *vaddr, int attr); /* Not supported yet */ unsigned long bmm_get_mem_size(void *vaddr); diff --git a/debian/changelog b/debian/changelog index 6ca85f2..3678154 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ marvell-libbmm (1.1.1) precise; urgency=low * Provide aligned malloc function * Fix type of physical addresses + * Remove bmm_get_kern_paddr() -- Russell King Thu, 25 Oct 2012 12:10:21 +0100 -- cgit