From patchwork Fri Dec 28 19:23:33 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 16019 Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1TofXO-0008I2-QZ; Fri, 28 Dec 2012 20:24:10 +0100 X-tubIT-Incoming-IP: 209.132.180.67 Received: from vger.kernel.org ([209.132.180.67]) by mail.tu-berlin.de (exim-4.75/mailfrontend-4) with esmtp id 1TofXO-0004XR-AO; Fri, 28 Dec 2012 20:24:10 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754867Ab2L1TX5 (ORCPT + 1 other); Fri, 28 Dec 2012 14:23:57 -0500 Received: from georges.telenet-ops.be ([195.130.137.68]:44887 "EHLO georges.telenet-ops.be" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754826Ab2L1TXx (ORCPT ); Fri, 28 Dec 2012 14:23:53 -0500 Received: from ayla.of.borg ([84.193.72.141]) by georges.telenet-ops.be with bizsmtp id h7Pr1k00Q32ts5g067PrST; Fri, 28 Dec 2012 20:23:51 +0100 Received: from geert by ayla.of.borg with local (Exim 4.71) (envelope-from ) id 1TofX5-0004ke-MP; Fri, 28 Dec 2012 20:23:51 +0100 From: Geert Uytterhoeven To: linux-arch@vger.kernel.org, Marek Szyprowski , linux-kernel@vger.kernel.org, linux-media@vger.kernel.org Cc: linux-m68k@vger.kernel.org, Geert Uytterhoeven Subject: [PATCH/RFC 3/4] avr32/bfin/c6x/cris/frv/m68k/mn10300/parisc/xtensa: Add dummy get_dma_ops() Date: Fri, 28 Dec 2012 20:23:33 +0100 Message-Id: <1356722614-18224-4-git-send-email-geert@linux-m68k.org> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: References: Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-PMX-Version: 5.6.1.2065439, Antispam-Engine: 2.7.2.376379, Antispam-Data: 2012.12.28.190917 X-PMX-Spam: Gauge=IIIIIIII, Probability=8%, Report=' MULTIPLE_RCPTS 0.1, HTML_00_01 0.05, HTML_00_10 0.05, BODY_SIZE_6000_6999 0, BODY_SIZE_7000_LESS 0, URI_ENDS_IN_HTML 0, __ANY_URI 0, __CP_URI_IN_BODY 0, __HAS_FROM 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __HAS_X_MAILING_LIST 0, __MIME_TEXT_ONLY 0, __MULTIPLE_RCPTS_CC_X2 0, __SANE_MSGID 0, __TO_MALFORMED_2 0, __TO_NO_NAME 0, __URI_NO_WWW 0, __URI_NS ' Provide dummy versions of get_dma_ops(), as dma_mmap_attrs() and dma_get_sgtable_attrs() (will) need these Signed-off-by: Geert Uytterhoeven --- arch/avr32/include/asm/dma-mapping.h | 8 ++++++++ arch/blackfin/include/asm/dma-mapping.h | 8 ++++++++ arch/c6x/include/asm/dma-mapping.h | 8 ++++++++ arch/cris/include/asm/dma-mapping.h | 8 ++++++++ arch/frv/include/asm/dma-mapping.h | 8 ++++++++ arch/m68k/include/asm/dma-mapping.h | 8 ++++++++ arch/mn10300/include/asm/dma-mapping.h | 8 ++++++++ arch/parisc/include/asm/dma-mapping.h | 8 ++++++++ arch/xtensa/include/asm/dma-mapping.h | 8 ++++++++ 9 files changed, 72 insertions(+), 0 deletions(-) diff --git a/arch/avr32/include/asm/dma-mapping.h b/arch/avr32/include/asm/dma-mapping.h index aaf5199..de55309 100644 --- a/arch/avr32/include/asm/dma-mapping.h +++ b/arch/avr32/include/asm/dma-mapping.h @@ -8,6 +8,14 @@ #include #include +/* + * Dummy to make dma_mmap_attrs()/dma_get_sgtable_attrs() happy + */ +static inline const struct dma_map_ops *get_dma_ops(struct device *dev) +{ + return NULL; +} + extern void dma_cache_sync(struct device *dev, void *vaddr, size_t size, int direction); diff --git a/arch/blackfin/include/asm/dma-mapping.h b/arch/blackfin/include/asm/dma-mapping.h index bbf4610..a2778b3 100644 --- a/arch/blackfin/include/asm/dma-mapping.h +++ b/arch/blackfin/include/asm/dma-mapping.h @@ -10,6 +10,14 @@ #include struct scatterlist; +/* + * Dummy to make dma_mmap_attrs()/dma_get_sgtable_attrs() happy + */ +static inline const struct dma_map_ops *get_dma_ops(struct device *dev) +{ + return NULL; +} + void *dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle, gfp_t gfp); void dma_free_coherent(struct device *dev, size_t size, void *vaddr, diff --git a/arch/c6x/include/asm/dma-mapping.h b/arch/c6x/include/asm/dma-mapping.h index 3c69406..5ae2f81 100644 --- a/arch/c6x/include/asm/dma-mapping.h +++ b/arch/c6x/include/asm/dma-mapping.h @@ -17,6 +17,14 @@ #define dma_supported(d, m) 1 +/* + * Dummy to make dma_mmap_attrs()/dma_get_sgtable_attrs() happy + */ +static inline const struct dma_map_ops *get_dma_ops(struct device *dev) +{ + return NULL; +} + static inline int dma_set_mask(struct device *dev, u64 dma_mask) { if (!dev->dma_mask || !dma_supported(dev, dma_mask)) diff --git a/arch/cris/include/asm/dma-mapping.h b/arch/cris/include/asm/dma-mapping.h index 8588b2c..05a55aa 100644 --- a/arch/cris/include/asm/dma-mapping.h +++ b/arch/cris/include/asm/dma-mapping.h @@ -10,6 +10,14 @@ #include #include +/* + * Dummy to make dma_mmap_attrs()/dma_get_sgtable_attrs() happy + */ +static inline const struct dma_map_ops *get_dma_ops(struct device *dev) +{ + return NULL; +} + #define dma_alloc_noncoherent(d, s, h, f) dma_alloc_coherent(d, s, h, f) #define dma_free_noncoherent(d, s, v, h) dma_free_coherent(d, s, v, h) diff --git a/arch/frv/include/asm/dma-mapping.h b/arch/frv/include/asm/dma-mapping.h index dfb8110..862e9b8 100644 --- a/arch/frv/include/asm/dma-mapping.h +++ b/arch/frv/include/asm/dma-mapping.h @@ -12,6 +12,14 @@ * following DMA API should work. */ +/* + * Dummy to make dma_mmap_attrs()/dma_get_sgtable_attrs() happy + */ +static inline const struct dma_map_ops *get_dma_ops(struct device *dev) +{ + return NULL; +} + #define dma_alloc_noncoherent(d, s, h, f) dma_alloc_coherent(d, s, h, f) #define dma_free_noncoherent(d, s, v, h) dma_free_coherent(d, s, v, h) diff --git a/arch/m68k/include/asm/dma-mapping.h b/arch/m68k/include/asm/dma-mapping.h index c68cdb4..d8977f5 100644 --- a/arch/m68k/include/asm/dma-mapping.h +++ b/arch/m68k/include/asm/dma-mapping.h @@ -5,6 +5,14 @@ struct scatterlist; +/* + * Dummy to make dma_mmap_attrs()/dma_get_sgtable_attrs() happy + */ +static inline const struct dma_map_ops *get_dma_ops(struct device *dev) +{ + return NULL; +} + static inline int dma_supported(struct device *dev, u64 mask) { return 1; diff --git a/arch/mn10300/include/asm/dma-mapping.h b/arch/mn10300/include/asm/dma-mapping.h index c1be439..b0cea53 100644 --- a/arch/mn10300/include/asm/dma-mapping.h +++ b/arch/mn10300/include/asm/dma-mapping.h @@ -22,6 +22,14 @@ * following DMA API should work. */ +/* + * Dummy to make dma_mmap_attrs()/dma_get_sgtable_attrs() happy + */ +static inline const struct dma_map_ops *get_dma_ops(struct device *dev) +{ + return NULL; +} + extern void *dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle, int flag); diff --git a/arch/parisc/include/asm/dma-mapping.h b/arch/parisc/include/asm/dma-mapping.h index 467bbd5..cdd450f 100644 --- a/arch/parisc/include/asm/dma-mapping.h +++ b/arch/parisc/include/asm/dma-mapping.h @@ -46,6 +46,14 @@ extern struct hppa_dma_ops pcx_dma_ops; extern struct hppa_dma_ops *hppa_dma_ops; +/* + * Dummy to make dma_mmap_attrs()/dma_get_sgtable_attrs() happy + */ +static inline const struct dma_map_ops *get_dma_ops(struct device *dev) +{ + return NULL; +} + static inline void * dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle, gfp_t flag) diff --git a/arch/xtensa/include/asm/dma-mapping.h b/arch/xtensa/include/asm/dma-mapping.h index 4acb5fe..0061c2d 100644 --- a/arch/xtensa/include/asm/dma-mapping.h +++ b/arch/xtensa/include/asm/dma-mapping.h @@ -26,6 +26,14 @@ extern void *consistent_alloc(int, size_t, dma_addr_t, unsigned long); extern void consistent_free(void*, size_t, dma_addr_t); extern void consistent_sync(void*, size_t, int); +/* + * Dummy to make dma_mmap_attrs()/dma_get_sgtable_attrs() happy + */ +static inline const struct dma_map_ops *get_dma_ops(struct device *dev) +{ + return NULL; +} + #define dma_alloc_noncoherent(d, s, h, f) dma_alloc_coherent(d, s, h, f) #define dma_free_noncoherent(d, s, v, h) dma_free_coherent(d, s, v, h)