diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2017-08-15 07:53:22 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2017-08-15 07:53:22 +0000 |
| commit | c46479e146062205f7bf1f1d73d9dde277251cf2 (patch) | |
| tree | 126ac23af01755de160adac30e27157781e5bb9a /arch/parisc/include/asm/dma-mapping.h | |
| parent | 2684a6c505531426bb7d4c8a68aab91abe6af05c (diff) | |
| parent | fbc4ea9a080b1523a6e77562645d9d79c6368a25 (diff) | |
| download | v4.4-nougat-iot-release.tar.gz | |
release-request-65fa9893-af48-4e1d-bbfd-0ad00ce88026-for-git_nyc-iot-release-4273224 snap-temp-L21600000093073568android-n-iot-release-smart-display-r2android-n-iot-release-smart-displayandroid-n-iot-release-polk-at1android-n-iot-release-lg-thinq-wk7android-n-iot-release-ihome-igv1nougat-iot-release
Change-Id: I9624021a4a6df994f06c0dcbee05ce5a15a11cfa
Diffstat (limited to 'arch/parisc/include/asm/dma-mapping.h')
| -rw-r--r-- | arch/parisc/include/asm/dma-mapping.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/arch/parisc/include/asm/dma-mapping.h b/arch/parisc/include/asm/dma-mapping.h index d8d60a57183f..f53725202955 100644 --- a/arch/parisc/include/asm/dma-mapping.h +++ b/arch/parisc/include/asm/dma-mapping.h @@ -39,6 +39,8 @@ struct hppa_dma_ops { ** flush/purge and allocate "regular" cacheable pages for everything. */ +#define DMA_ERROR_CODE (~(dma_addr_t)0) + #ifdef CONFIG_PA11 extern struct hppa_dma_ops pcxl_dma_ops; extern struct hppa_dma_ops pcx_dma_ops; @@ -209,12 +211,13 @@ parisc_walk_tree(struct device *dev) break; } } - BUG_ON(!dev->platform_data); return dev->platform_data; } - -#define GET_IOC(dev) (HBA_DATA(parisc_walk_tree(dev))->iommu) - + +#define GET_IOC(dev) ({ \ + void *__pdata = parisc_walk_tree(dev); \ + __pdata ? HBA_DATA(__pdata)->iommu : NULL; \ +}) #ifdef CONFIG_IOMMU_CCIO struct parisc_device; |