| Message ID | 1393535872-20915-3-git-send-email-santosh.shilimkar@ti.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Thursday 27 February 2014 16:17:47 Santosh Shilimkar wrote: > From: Grygorii Strashko <grygorii.strashko@ti.com> > > Remove dma_to_virt() as there are no in-tree users of it. > > Cc: Russell King <linux@arm.linux.org.uk> > Cc: Arnd Bergmann <arnd@arndb.de> > Cc: Olof Johansson <olof@lixom.net> > Cc: Greg Ungerer <gerg@uclinux.org> > Cc: Tony Lindgren <tony@atomide.com> > Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com> > Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com> Acked-by: Arnd Bergmann <arnd@arndb.de>
Hi Santosh, On 28/02/14 07:17, Santosh Shilimkar wrote: > From: Grygorii Strashko <grygorii.strashko@ti.com> > > Remove dma_to_virt() as there are no in-tree users of it. > > Cc: Russell King <linux@arm.linux.org.uk> > Cc: Arnd Bergmann <arnd@arndb.de> > Cc: Olof Johansson <olof@lixom.net> > Cc: Greg Ungerer <gerg@uclinux.org> > Cc: Tony Lindgren <tony@atomide.com> > Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com> > Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com> I am fine with the ks8695 change: Acked-by: Greg Ungerer <gerg@uclinux.org> > --- > arch/arm/include/asm/dma-mapping.h | 14 +------------- > arch/arm/mach-iop13xx/include/mach/memory.h | 11 ----------- > arch/arm/mach-ks8695/include/mach/memory.h | 2 -- > arch/arm/mach-omap1/include/mach/memory.h | 4 ---- > 4 files changed, 1 insertion(+), 30 deletions(-) > > diff --git a/arch/arm/include/asm/dma-mapping.h b/arch/arm/include/asm/dma-mapping.h > index 247ed72..e365158 100644 > --- a/arch/arm/include/asm/dma-mapping.h > +++ b/arch/arm/include/asm/dma-mapping.h > @@ -51,7 +51,7 @@ static inline int dma_set_mask(struct device *dev, u64 mask) > #endif > > /* > - * dma_to_pfn/pfn_to_dma/dma_to_virt/virt_to_dma are architecture private > + * dma_to_pfn/pfn_to_dma/virt_to_dma are architecture private > * functions used internally by the DMA-mapping API to provide DMA > * addresses. They must not be used by drivers. > */ > @@ -70,13 +70,6 @@ static inline unsigned long dma_to_pfn(struct device *dev, dma_addr_t addr) > return __bus_to_pfn(addr) + dev->archdata.dma_pfn_offset; > } > > -static inline void *dma_to_virt(struct device *dev, dma_addr_t addr) > -{ > - if (!dev) > - return NULL; > - return (void *)__bus_to_virt(__pfn_to_bus(dma_to_pfn(dev, addr))); > -} > - > static inline dma_addr_t virt_to_dma(struct device *dev, void *addr) > { > if (!dev) > @@ -96,11 +89,6 @@ static inline unsigned long dma_to_pfn(struct device *dev, dma_addr_t addr) > return __arch_dma_to_pfn(dev, addr); > } > > -static inline void *dma_to_virt(struct device *dev, dma_addr_t addr) > -{ > - return __arch_dma_to_virt(dev, addr); > -} > - > static inline dma_addr_t virt_to_dma(struct device *dev, void *addr) > { > return __arch_virt_to_dma(dev, addr); > diff --git a/arch/arm/mach-iop13xx/include/mach/memory.h b/arch/arm/mach-iop13xx/include/mach/memory.h > index 7c032d0..1223c85 100644 > --- a/arch/arm/mach-iop13xx/include/mach/memory.h > +++ b/arch/arm/mach-iop13xx/include/mach/memory.h > @@ -36,17 +36,6 @@ static inline void __iomem *__lbus_to_virt(dma_addr_t x) > #define is_lbus_device(dev) \ > (dev && strncmp(dev->bus->name, "platform", 8) == 0) > > -#define __arch_dma_to_virt(dev, addr) \ > - ({ \ > - void * __virt; \ > - dma_addr_t __dma = addr; \ > - if (is_lbus_device(dev) && __is_lbus_dma(__dma)) \ > - __virt = __lbus_to_virt(__dma); \ > - else \ > - __virt = (void *)__phys_to_virt(__dma); \ > - __virt; \ > - }) > - > #define __arch_virt_to_dma(dev, addr) \ > ({ \ > void * __virt = addr; \ > diff --git a/arch/arm/mach-ks8695/include/mach/memory.h b/arch/arm/mach-ks8695/include/mach/memory.h > index 95e731a..f42477c 100644 > --- a/arch/arm/mach-ks8695/include/mach/memory.h > +++ b/arch/arm/mach-ks8695/include/mach/memory.h > @@ -31,8 +31,6 @@ > /* Platform-bus mapping */ > extern struct bus_type platform_bus_type; > #define is_lbus_device(dev) (dev && dev->bus == &platform_bus_type) > -#define __arch_dma_to_virt(dev, x) ({ (void *) (is_lbus_device(dev) ? \ > - __phys_to_virt(x) : __bus_to_virt(x)); }) > #define __arch_virt_to_dma(dev, x) ({ is_lbus_device(dev) ? \ > (dma_addr_t)__virt_to_phys((unsigned long)x) \ > : (dma_addr_t)__virt_to_bus(x); }) > diff --git a/arch/arm/mach-omap1/include/mach/memory.h b/arch/arm/mach-omap1/include/mach/memory.h > index 3c25305..73f86db 100644 > --- a/arch/arm/mach-omap1/include/mach/memory.h > +++ b/arch/arm/mach-omap1/include/mach/memory.h > @@ -43,10 +43,6 @@ > __phys_to_pfn(__dma); \ > }) > > -#define __arch_dma_to_virt(dev, addr) ({ (void *) (is_lbus_device(dev) ? \ > - lbus_to_virt(addr) : \ > - __phys_to_virt(addr)); }) > - > #define __arch_virt_to_dma(dev, addr) ({ unsigned long __addr = (unsigned long)(addr); \ > (dma_addr_t) (is_lbus_device(dev) ? \ > virt_to_lbus(__addr) : \ >
diff --git a/arch/arm/include/asm/dma-mapping.h b/arch/arm/include/asm/dma-mapping.h index 247ed72..e365158 100644 --- a/arch/arm/include/asm/dma-mapping.h +++ b/arch/arm/include/asm/dma-mapping.h @@ -51,7 +51,7 @@ static inline int dma_set_mask(struct device *dev, u64 mask) #endif /* - * dma_to_pfn/pfn_to_dma/dma_to_virt/virt_to_dma are architecture private + * dma_to_pfn/pfn_to_dma/virt_to_dma are architecture private * functions used internally by the DMA-mapping API to provide DMA * addresses. They must not be used by drivers. */ @@ -70,13 +70,6 @@ static inline unsigned long dma_to_pfn(struct device *dev, dma_addr_t addr) return __bus_to_pfn(addr) + dev->archdata.dma_pfn_offset; } -static inline void *dma_to_virt(struct device *dev, dma_addr_t addr) -{ - if (!dev) - return NULL; - return (void *)__bus_to_virt(__pfn_to_bus(dma_to_pfn(dev, addr))); -} - static inline dma_addr_t virt_to_dma(struct device *dev, void *addr) { if (!dev) @@ -96,11 +89,6 @@ static inline unsigned long dma_to_pfn(struct device *dev, dma_addr_t addr) return __arch_dma_to_pfn(dev, addr); } -static inline void *dma_to_virt(struct device *dev, dma_addr_t addr) -{ - return __arch_dma_to_virt(dev, addr); -} - static inline dma_addr_t virt_to_dma(struct device *dev, void *addr) { return __arch_virt_to_dma(dev, addr); diff --git a/arch/arm/mach-iop13xx/include/mach/memory.h b/arch/arm/mach-iop13xx/include/mach/memory.h index 7c032d0..1223c85 100644 --- a/arch/arm/mach-iop13xx/include/mach/memory.h +++ b/arch/arm/mach-iop13xx/include/mach/memory.h @@ -36,17 +36,6 @@ static inline void __iomem *__lbus_to_virt(dma_addr_t x) #define is_lbus_device(dev) \ (dev && strncmp(dev->bus->name, "platform", 8) == 0) -#define __arch_dma_to_virt(dev, addr) \ - ({ \ - void * __virt; \ - dma_addr_t __dma = addr; \ - if (is_lbus_device(dev) && __is_lbus_dma(__dma)) \ - __virt = __lbus_to_virt(__dma); \ - else \ - __virt = (void *)__phys_to_virt(__dma); \ - __virt; \ - }) - #define __arch_virt_to_dma(dev, addr) \ ({ \ void * __virt = addr; \ diff --git a/arch/arm/mach-ks8695/include/mach/memory.h b/arch/arm/mach-ks8695/include/mach/memory.h index 95e731a..f42477c 100644 --- a/arch/arm/mach-ks8695/include/mach/memory.h +++ b/arch/arm/mach-ks8695/include/mach/memory.h @@ -31,8 +31,6 @@ /* Platform-bus mapping */ extern struct bus_type platform_bus_type; #define is_lbus_device(dev) (dev && dev->bus == &platform_bus_type) -#define __arch_dma_to_virt(dev, x) ({ (void *) (is_lbus_device(dev) ? \ - __phys_to_virt(x) : __bus_to_virt(x)); }) #define __arch_virt_to_dma(dev, x) ({ is_lbus_device(dev) ? \ (dma_addr_t)__virt_to_phys((unsigned long)x) \ : (dma_addr_t)__virt_to_bus(x); }) diff --git a/arch/arm/mach-omap1/include/mach/memory.h b/arch/arm/mach-omap1/include/mach/memory.h index 3c25305..73f86db 100644 --- a/arch/arm/mach-omap1/include/mach/memory.h +++ b/arch/arm/mach-omap1/include/mach/memory.h @@ -43,10 +43,6 @@ __phys_to_pfn(__dma); \ }) -#define __arch_dma_to_virt(dev, addr) ({ (void *) (is_lbus_device(dev) ? \ - lbus_to_virt(addr) : \ - __phys_to_virt(addr)); }) - #define __arch_virt_to_dma(dev, addr) ({ unsigned long __addr = (unsigned long)(addr); \ (dma_addr_t) (is_lbus_device(dev) ? \ virt_to_lbus(__addr) : \