From: Christoph Hellwig <hch-jcswGhMUV9g@public.gmane.org>
To: iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org
Cc: linux-mips-6z/3iImG2C8G8FEW9MqTrA@public.gmane.org,
linux-ia64-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
linux-sh-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
sparclinux-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
Guan Xuetao <gxt-TG0Ac1+ktVePQbnJrJN+5g@public.gmane.org>,
linux-arch-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
linux-s390-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
linux-c6x-dev-jPsnJVOj+W6hPH1hqNUYSQ@public.gmane.org,
linux-hexagon-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
x86-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org,
Konrad Rzeszutek Wilk
<konrad-Gq0aWv8utHQdnm+yROfE0A@public.gmane.org>,
linux-snps-arc-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org,
linux-m68k-cunTk1MwBs8S/qaLPR03pWD2FQJk+8+b@public.gmane.org,
patches-q3qR2WxjNRFS9aJRtSZj7A@public.gmane.org,
linux-metag-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org,
Michal Simek <monstr-pSz03upnqPeHXe+LvDLADg@public.gmane.org>,
linux-parisc-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
linux-cris-kernel-VrBV9hrLPhE@public.gmane.org,
linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
linux-alpha-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
linuxppc-dev-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org
Subject: [PATCH 16/33] microblaze: remove dma_nommu_dma_supported
Date: Wed, 10 Jan 2018 09:00:10 +0100 [thread overview]
Message-ID: <20180110080027.13879-17-hch@lst.de> (raw)
In-Reply-To: <20180110080027.13879-1-hch-jcswGhMUV9g@public.gmane.org>
Always returning 1 is the same behavior as not supplying a method at all.
Signed-off-by: Christoph Hellwig <hch-jcswGhMUV9g@public.gmane.org>
---
arch/microblaze/kernel/dma.c | 6 ------
arch/parisc/kernel/pci-dma.c | 7 -------
2 files changed, 13 deletions(-)
diff --git a/arch/microblaze/kernel/dma.c b/arch/microblaze/kernel/dma.c
index 450803e5731a..b45d8f8967af 100644
--- a/arch/microblaze/kernel/dma.c
+++ b/arch/microblaze/kernel/dma.c
@@ -89,11 +89,6 @@ static int dma_nommu_map_sg(struct device *dev, struct scatterlist *sgl,
return nents;
}
-static int dma_nommu_dma_supported(struct device *dev, u64 mask)
-{
- return 1;
-}
-
static inline dma_addr_t dma_nommu_map_page(struct device *dev,
struct page *page,
unsigned long offset,
@@ -209,7 +204,6 @@ const struct dma_map_ops dma_nommu_ops = {
.free = dma_nommu_free_coherent,
.mmap = dma_nommu_mmap_coherent,
.map_sg = dma_nommu_map_sg,
- .dma_supported = dma_nommu_dma_supported,
.map_page = dma_nommu_map_page,
.unmap_page = dma_nommu_unmap_page,
.sync_single_for_cpu = dma_nommu_sync_single_for_cpu,
diff --git a/arch/parisc/kernel/pci-dma.c b/arch/parisc/kernel/pci-dma.c
index c0dfd892f70c..91bc0cac03a1 100644
--- a/arch/parisc/kernel/pci-dma.c
+++ b/arch/parisc/kernel/pci-dma.c
@@ -75,11 +75,6 @@ void dump_resmap(void)
static inline void dump_resmap(void) {;}
#endif
-static int pa11_dma_supported( struct device *dev, u64 mask)
-{
- return 1;
-}
-
static inline int map_pte_uncached(pte_t * pte,
unsigned long vaddr,
unsigned long size, unsigned long *paddr_ptr)
@@ -579,7 +574,6 @@ static void pa11_dma_cache_sync(struct device *dev, void *vaddr, size_t size,
}
const struct dma_map_ops pcxl_dma_ops = {
- .dma_supported = pa11_dma_supported,
.alloc = pa11_dma_alloc,
.free = pa11_dma_free,
.map_page = pa11_dma_map_page,
@@ -616,7 +610,6 @@ static void pcx_dma_free(struct device *dev, size_t size, void *vaddr,
}
const struct dma_map_ops pcx_dma_ops = {
- .dma_supported = pa11_dma_supported,
.alloc = pcx_dma_alloc,
.free = pcx_dma_free,
.map_page = pa11_dma_map_page,
--
2.14.2
next prev parent reply other threads:[~2018-01-10 8:00 UTC|newest]
Thread overview: 53+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-10 7:59 consolidate direct dma mapping V3 Christoph Hellwig
2018-01-10 7:59 ` [PATCH 02/33] hexagon: remove unused flush_write_buffers definition Christoph Hellwig
2018-01-10 7:59 ` [PATCH 05/33] arc: remove CONFIG_ARC_PLAT_NEEDS_PHYS_TO_DMA Christoph Hellwig
2018-01-10 8:00 ` [PATCH 06/33] m32r: remove the unused dma_capable helper Christoph Hellwig
2018-01-10 8:00 ` [PATCH 09/33] dma-mapping: take dma_pfn_offset into account in dma_max_pfn Christoph Hellwig
2018-01-10 11:07 ` Robin Murphy
2018-01-10 8:00 ` [PATCH 12/33] dma-mapping: move dma_mark_clean to dma-direct.h Christoph Hellwig
2018-01-10 8:00 ` [PATCH 13/33] hexagon: use the generic dma_capable helper Christoph Hellwig
[not found] ` <20180110080027.13879-1-hch-jcswGhMUV9g@public.gmane.org>
2018-01-10 7:59 ` [PATCH 01/33] alpha: mark jensen as broken Christoph Hellwig
2018-01-10 7:59 ` [PATCH 03/33] m32r: remove unused flush_write_buffers definition Christoph Hellwig
2018-01-10 7:59 ` [PATCH 04/33] powerpc: " Christoph Hellwig
2018-01-10 8:00 ` [PATCH 07/33] riscv: remove the unused dma_capable helper Christoph Hellwig
2018-01-10 8:00 ` [PATCH 08/33] s390: " Christoph Hellwig
2018-01-10 8:00 ` [PATCH 10/33] arm64: don't override dma_max_pfn Christoph Hellwig
2018-01-10 11:08 ` Robin Murphy
2018-01-10 8:00 ` [PATCH 11/33] dma-mapping: move swiotlb arch helpers to a new header Christoph Hellwig
2018-01-10 9:31 ` Vladimir Murzin
2018-01-10 15:22 ` Christoph Hellwig
[not found] ` <20180110080027.13879-12-hch-jcswGhMUV9g@public.gmane.org>
2018-01-10 14:56 ` Robin Murphy
2018-01-10 15:26 ` Christoph Hellwig
2018-01-10 15:31 ` Robin Murphy
2018-01-10 15:40 ` Christoph Hellwig
2018-01-10 8:00 ` [PATCH 14/33] powerpc: rename dma_direct_ to dma_nommu_ Christoph Hellwig
2018-01-10 8:00 ` [PATCH 15/33] microblaze: rename dma_direct to dma_nommu Christoph Hellwig
2018-01-10 8:00 ` Christoph Hellwig [this message]
2018-01-10 8:00 ` [PATCH 18/33] s390: move s390_pci_dma_ops to asm/pci_dma.h Christoph Hellwig
2018-01-10 8:00 ` [PATCH 19/33] dma-mapping: warn when there is no coherent_dma_mask Christoph Hellwig
[not found] ` <20180110080027.13879-20-hch-jcswGhMUV9g@public.gmane.org>
2018-01-12 13:16 ` Konrad Rzeszutek Wilk
2018-01-10 8:00 ` [PATCH 20/33] dma-mapping: clear harmful GFP_* flags in common code Christoph Hellwig
[not found] ` <20180110080027.13879-21-hch-jcswGhMUV9g@public.gmane.org>
2018-01-10 11:59 ` Robin Murphy
2018-01-10 15:29 ` Christoph Hellwig
2018-01-10 8:00 ` [PATCH 27/33] dma-direct: use node local allocations for coherent memory Christoph Hellwig
2018-01-10 12:06 ` Robin Murphy
[not found] ` <3672aa56-b85c-5d2c-0c0e-709031b0c0a0-5wv7dgnIgG8@public.gmane.org>
2018-01-10 15:30 ` Christoph Hellwig
2018-01-10 16:49 ` Robin Murphy
2018-01-10 8:00 ` [PATCH 17/33] microblaze: remove the dead !NOT_COHERENT_CACHE dma code Christoph Hellwig
2018-01-10 8:00 ` [PATCH 21/33] dma-mapping: add an arch_dma_supported hook Christoph Hellwig
2018-01-12 13:17 ` Konrad Rzeszutek Wilk
2018-01-10 8:00 ` [PATCH 22/33] dma-mapping: provide a generic asm/dma-mapping.h Christoph Hellwig
2018-01-10 8:00 ` [PATCH 23/33] dma-direct: rename dma_noop to dma_direct Christoph Hellwig
2018-01-10 8:00 ` [PATCH 24/33] dma-direct: use phys_to_dma Christoph Hellwig
2018-01-10 8:00 ` [PATCH 25/33] dma-direct: add dma address sanity checks Christoph Hellwig
2018-01-10 8:00 ` [PATCH 26/33] dma-direct: add support for CMA allocation Christoph Hellwig
2018-01-10 8:00 ` [PATCH 28/33] dma-direct: add support for allocation from ZONE_DMA and ZONE_DMA32 Christoph Hellwig
2018-01-10 8:00 ` [PATCH 29/33] dma-direct: retry allocations using GFP_DMA for small masks Christoph Hellwig
2018-01-10 9:32 ` Vladimir Murzin
2018-01-10 8:00 ` [PATCH 30/33] dma-direct: make dma_direct_{alloc,free} available to other implementations Christoph Hellwig
2018-01-10 8:00 ` [PATCH 31/33] dma-direct: reject too small dma masks Christoph Hellwig
2018-01-10 11:49 ` Robin Murphy
2018-01-10 15:32 ` Christoph Hellwig
2018-01-10 17:00 ` Robin Murphy
2018-01-10 8:00 ` [PATCH 32/33] cris: use dma-direct Christoph Hellwig
2018-01-10 8:00 ` [PATCH 33/33] h8300: " Christoph Hellwig
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180110080027.13879-17-hch@lst.de \
--to=hch-jcswghmuv9g@public.gmane.org \
--cc=gxt-TG0Ac1+ktVePQbnJrJN+5g@public.gmane.org \
--cc=iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org \
--cc=konrad-Gq0aWv8utHQdnm+yROfE0A@public.gmane.org \
--cc=linux-alpha-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=linux-arch-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org \
--cc=linux-c6x-dev-jPsnJVOj+W6hPH1hqNUYSQ@public.gmane.org \
--cc=linux-cris-kernel-VrBV9hrLPhE@public.gmane.org \
--cc=linux-hexagon-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=linux-ia64-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=linux-m68k-cunTk1MwBs8S/qaLPR03pWD2FQJk+8+b@public.gmane.org \
--cc=linux-metag-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=linux-mips-6z/3iImG2C8G8FEW9MqTrA@public.gmane.org \
--cc=linux-parisc-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=linux-s390-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=linux-sh-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=linux-snps-arc-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org \
--cc=linuxppc-dev-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org \
--cc=monstr-pSz03upnqPeHXe+LvDLADg@public.gmane.org \
--cc=patches-q3qR2WxjNRFS9aJRtSZj7A@public.gmane.org \
--cc=sparclinux-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=x86-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).