diff options
| author | Michael Ellerman <mpe@ellerman.id.au> | 2019-02-21 15:15:10 +0300 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2019-02-21 15:15:10 +0300 |
| commit | d0055df0c9c1471c389197a69f43e300185a75aa (patch) | |
| tree | 7a1c253162f9ea99bf544fac4ae9219c398cae3f /drivers/misc | |
| parent | 637cfeb9f99ca097747139a5419bc23e0b885655 (diff) | |
| parent | 4a605e2d1a69f5aea06da10d81e22802a90812a3 (diff) | |
| download | linux-d0055df0c9c1471c389197a69f43e300185a75aa.tar.xz | |
Merge branch 'topic/dma' into next
Merge hch's big DMA rework series. This is in a topic branch in case he
wants to merge it to minimise conflicts.
Diffstat (limited to 'drivers/misc')
| -rw-r--r-- | drivers/misc/cxl/vphb.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/misc/cxl/vphb.c b/drivers/misc/cxl/vphb.c index 49da2f744bbf..631c5df246d4 100644 --- a/drivers/misc/cxl/vphb.c +++ b/drivers/misc/cxl/vphb.c @@ -43,8 +43,7 @@ static bool cxl_pci_enable_device_hook(struct pci_dev *dev) return false; } - set_dma_ops(&dev->dev, &dma_nommu_ops); - set_dma_offset(&dev->dev, PAGE_OFFSET); + dev->dev.archdata.dma_offset = PAGE_OFFSET; /* * Allocate a context to do cxl things too. If we eventually do real |