From: Geert Uytterhoeven <geert@linux-m68k.org>
To: linux-m68k@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Subject: [patch 7/8] m68k: Add missing dma_sync_single_range_for_{cpu,device}()
Date: Wed, 03 Sep 2008 09:15:49 +0200 [thread overview]
Message-ID: <20080903071742.932797091@mail.of.borg> (raw)
In-Reply-To: 20080903071542.615137611@mail.of.borg
[-- Attachment #1: m68k-add-dma_sync_single_range_for_cpu-device.diff --]
[-- Type: text/plain, Size: 2655 bytes --]
From: Geert Uytterhoeven <geert@linux-m68k.org>
| include/linux/ssb/ssb.h: In function 'ssb_dma_sync_single_range_for_cpu':
| include/linux/ssb/ssb.h:517: error: implicit declaration of function 'dma_sync_single_range_for_cpu'
| include/linux/ssb/ssb.h: In function 'ssb_dma_sync_single_range_for_device':
| include/linux/ssb/ssb.h:538: error: implicit declaration of function 'dma_sync_single_range_for_device'
Add the missing dma_sync_single_range_for_{cpu,device}(), and remove the bogus
`inline' for the non-static function dma_sync_single_for_device().
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
---
arch/m68k/kernel/dma.c | 4 ++--
include/asm-m68k/dma-mapping.h | 16 ++++++++++++++++
2 files changed, 18 insertions(+), 2 deletions(-)
--- a/arch/m68k/kernel/dma.c
+++ b/arch/m68k/kernel/dma.c
@@ -66,8 +66,8 @@ void dma_free_coherent(struct device *de
}
EXPORT_SYMBOL(dma_free_coherent);
-inline void dma_sync_single_for_device(struct device *dev, dma_addr_t handle, size_t size,
- enum dma_data_direction dir)
+void dma_sync_single_for_device(struct device *dev, dma_addr_t handle,
+ size_t size, enum dma_data_direction dir)
{
switch (dir) {
case DMA_TO_DEVICE:
--- a/include/asm-m68k/dma-mapping.h
+++ b/include/asm-m68k/dma-mapping.h
@@ -74,6 +74,14 @@ extern void dma_sync_single_for_device(s
extern void dma_sync_sg_for_device(struct device *, struct scatterlist *, int,
enum dma_data_direction);
+static inline void dma_sync_single_range_for_device(struct device *dev,
+ dma_addr_t dma_handle, unsigned long offset, size_t size,
+ enum dma_data_direction direction)
+{
+ /* just sync everything for now */
+ dma_sync_single_for_device(dev, dma_handle, offset + size, direction);
+}
+
static inline void dma_sync_single_for_cpu(struct device *dev, dma_addr_t handle,
size_t size, enum dma_data_direction dir)
{
@@ -84,6 +92,14 @@ static inline void dma_sync_sg_for_cpu(s
{
}
+static inline void dma_sync_single_range_for_cpu(struct device *dev,
+ dma_addr_t dma_handle, unsigned long offset, size_t size,
+ enum dma_data_direction direction)
+{
+ /* just sync everything for now */
+ dma_sync_single_for_cpu(dev, dma_handle, offset + size, direction);
+}
+
static inline int dma_mapping_error(struct device *dev, dma_addr_t handle)
{
return 0;
--
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
next prev parent reply other threads:[~2008-09-03 7:20 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-09-03 7:15 [patch 0/8] RFC: m68k patches for 2.6.28 Geert Uytterhoeven
2008-09-03 7:15 ` [patch 1/8] m68k: Use new printk() extension %pS to print symbols Geert Uytterhoeven
2008-09-03 7:15 ` [patch 2/8] m68k: Reverse platform MMU logic so Sun 3 is last Geert Uytterhoeven
2008-09-03 7:36 ` Adrian Bunk
2008-09-03 11:13 ` Laurent Vivier
2008-09-03 12:07 ` Adrian Bunk
2008-09-05 17:34 ` Riccardo
2008-09-03 18:10 ` Brad Boyer
2008-09-05 17:36 ` Riccardo
2008-09-23 21:47 ` Lance Tagliapietra
2008-09-03 19:22 ` Geert Uytterhoeven
2008-09-03 7:15 ` [patch 3/8] m68k: Disable Amiga serial console support if modular Geert Uytterhoeven
2008-09-03 7:15 ` [patch 4/8] m68k: Modular Amiga keyboard needs key_maps Geert Uytterhoeven
2008-09-03 7:15 ` [patch 5/8] m68k: Remove unused atari_kbd_translate() Geert Uytterhoeven
2008-09-04 9:32 ` Michael Schmitz
2008-09-04 9:39 ` Geert Uytterhoeven
2008-09-04 9:49 ` Michael Schmitz
2008-09-03 7:15 ` [patch 6/8] m68k: Define rtc_lock on Atari Geert Uytterhoeven
2008-09-04 9:51 ` Michael Schmitz
2008-09-03 7:15 ` Geert Uytterhoeven [this message]
2008-09-03 10:59 ` [patch 7/8] m68k: Add missing dma_sync_single_range_for_{cpu,device}() Roman Zippel
2008-09-03 11:17 ` [patch 7/8] m68k: Add missing dma_sync_single_range_for_{cpu, device}() Geert Uytterhoeven
2008-09-03 11:22 ` Geert Uytterhoeven
2008-09-03 11:39 ` Roman Zippel
2008-09-03 12:12 ` [patch 7/8] m68k: Add missing dma_sync_single_range_for_{cpu,device}() Adrian Bunk
2008-09-03 12:36 ` Roman Zippel
2008-09-03 7:15 ` [patch 8/8] m68k: <asm/pci.h> needs <asm-generic/pci-dma-compat.h> Geert Uytterhoeven
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=20080903071742.932797091@mail.of.borg \
--to=geert@linux-m68k.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-m68k@vger.kernel.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