diff options
| author | Christoph Hellwig <hch@lst.de> | 2018-06-19 09:04:53 +0200 |
|---|---|---|
| committer | Helge Deller <deller@gmx.de> | 2018-08-13 09:30:13 +0200 |
| commit | a34a9b9682a5a9de53386ed0872c7d38ca9d6b38 (patch) | |
| tree | b2aeaba7ec847ab4216569f1f44b0c4598ab4f0d /arch/parisc/kernel/setup.c | |
| parent | 94710cac0ef4ee177a63b5227664b38c95bbf703 (diff) | |
| download | lwn-a34a9b9682a5a9de53386ed0872c7d38ca9d6b38.tar.gz lwn-a34a9b9682a5a9de53386ed0872c7d38ca9d6b38.zip | |
parisc: merge pcx_dma_ops and pcxl_dma_ops
The only difference is that pcxl supports dma coherent allocations, while
pcx only supports non-consistent allocations and otherwise fails.
But dma_alloc* is not in the fast path, and merging these two allows an
easy migration path to the generic dma-noncoherent implementation, so
do it.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Helge Deller <deller@gmx.de>
Diffstat (limited to 'arch/parisc/kernel/setup.c')
| -rw-r--r-- | arch/parisc/kernel/setup.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/arch/parisc/kernel/setup.c b/arch/parisc/kernel/setup.c index 8d3a7b80ac42..5c8450a22255 100644 --- a/arch/parisc/kernel/setup.c +++ b/arch/parisc/kernel/setup.c @@ -97,14 +97,12 @@ void __init dma_ops_init(void) panic( "PA-RISC Linux currently only supports machines that conform to\n" "the PA-RISC 1.1 or 2.0 architecture specification.\n"); - case pcxs: - case pcxt: - hppa_dma_ops = &pcx_dma_ops; - break; case pcxl2: pa7300lc_init(); case pcxl: /* falls through */ - hppa_dma_ops = &pcxl_dma_ops; + case pcxs: + case pcxt: + hppa_dma_ops = &pa11_dma_ops; break; default: break; |