mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: tip-bot for FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
To: linux-tip-commits@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@redhat.com,
	fujita.tomonori@lab.ntt.co.jp, davem@davemloft.net,
	reif@earthlink.net, tglx@linutronix.de, mingo@elte.hu
Subject: [tip:core/iommu] sparc: Remove no-op dma_4v_sync_single_for_cpu and dma_4v_sync_sg_for_cpu
Date: Mon, 10 Aug 2009 08:47:17 GMT	[thread overview]
Message-ID: <tip-595cc8560783ea31ed1208dc1f97282a2a5606b7@git.kernel.org> (raw)
In-Reply-To: <1249872797-1314-6-git-send-email-fujita.tomonori@lab.ntt.co.jp>

Commit-ID:  595cc8560783ea31ed1208dc1f97282a2a5606b7
Gitweb:     http://git.kernel.org/tip/595cc8560783ea31ed1208dc1f97282a2a5606b7
Author:     FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
AuthorDate: Mon, 10 Aug 2009 11:53:14 +0900
Committer:  Ingo Molnar <mingo@elte.hu>
CommitDate: Mon, 10 Aug 2009 09:34:59 +0200

sparc: Remove no-op dma_4v_sync_single_for_cpu and dma_4v_sync_sg_for_cpu

Now sparc uses include/asm-generic/dma-mapping-common.h.
pci_sun4v.c doesn't need to have no-op
dma_4v_sync_single_for_cpu and dma_4v_sync_sg_for_cpu
(dma-mapping-common.h does nothing if sync_{single|sg}_for_cpu
hook is not defined). So we can remove them safely.

Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Tested-by: Robert Reif <reif@earthlink.net>
Acked-by: David S. Miller <davem@davemloft.net>
Cc: tony.luck@intel.com
Cc: fenghua.yu@intel.com
LKML-Reference: <1249872797-1314-6-git-send-email-fujita.tomonori@lab.ntt.co.jp>
Signed-off-by: Ingo Molnar <mingo@elte.hu>


---
 arch/sparc/kernel/pci_sun4v.c |   16 ----------------
 1 files changed, 0 insertions(+), 16 deletions(-)

diff --git a/arch/sparc/kernel/pci_sun4v.c b/arch/sparc/kernel/pci_sun4v.c
index ee800f9..23c33ff 100644
--- a/arch/sparc/kernel/pci_sun4v.c
+++ b/arch/sparc/kernel/pci_sun4v.c
@@ -525,20 +525,6 @@ static void dma_4v_unmap_sg(struct device *dev, struct scatterlist *sglist,
 	spin_unlock_irqrestore(&iommu->lock, flags);
 }
 
-static void dma_4v_sync_single_for_cpu(struct device *dev,
-				       dma_addr_t bus_addr, size_t sz,
-				       enum dma_data_direction direction)
-{
-	/* Nothing to do... */
-}
-
-static void dma_4v_sync_sg_for_cpu(struct device *dev,
-				   struct scatterlist *sglist, int nelems,
-				   enum dma_data_direction direction)
-{
-	/* Nothing to do... */
-}
-
 static struct dma_map_ops sun4v_dma_ops = {
 	.alloc_coherent			= dma_4v_alloc_coherent,
 	.free_coherent			= dma_4v_free_coherent,
@@ -546,8 +532,6 @@ static struct dma_map_ops sun4v_dma_ops = {
 	.unmap_page			= dma_4v_unmap_page,
 	.map_sg				= dma_4v_map_sg,
 	.unmap_sg			= dma_4v_unmap_sg,
-	.sync_single_for_cpu		= dma_4v_sync_single_for_cpu,
-	.sync_sg_for_cpu		= dma_4v_sync_sg_for_cpu,
 };
 
 static void __devinit pci_sun4v_scan_bus(struct pci_pbm_info *pbm,

  reply	other threads:[~2009-08-10  8:48 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-08-10  2:53 [PATCH resend 0/8] sparc: use asm-generic/dma-mapping-common.h and pci-dma-compat.h FUJITA Tomonori
2009-08-10  2:53 ` [PATCH 1/8] remove flush_write_buffers() in dma-mapping-common.h FUJITA Tomonori
2009-08-10  8:46   ` [tip:core/iommu] dma-ops: Remove " tip-bot for Arnd Bergmann
2009-08-10  2:53 ` [PATCH 2/8] IA64: remove NULL flush_write_buffers FUJITA Tomonori
2009-08-10  8:46   ` [tip:core/iommu] IA64: Remove " tip-bot for FUJITA Tomonori
2009-08-10  2:53 ` [PATCH 3/8] sparc: use dma_map_ops struct FUJITA Tomonori
2009-08-10  8:46   ` [tip:core/iommu] sparc: Use " tip-bot for FUJITA Tomonori
2009-08-10  2:53 ` [PATCH 4/8] sparc: use asm-generic/dma-mapping-common.h FUJITA Tomonori
2009-08-10  8:47   ` [tip:core/iommu] sparc: Use asm-generic/dma-mapping-common.h tip-bot for FUJITA Tomonori
2009-08-10  2:53 ` [PATCH 5/8] sparc: remove no-op dma_4v_sync_single_for_cpu and dma_4v_sync_sg_for_cpu FUJITA Tomonori
2009-08-10  8:47   ` tip-bot for FUJITA Tomonori [this message]
2009-08-10  2:53 ` [PATCH 6/8] sparc: replace sbus_map_single and sbus_unmap_single with sbus_map_page and sbus_unmap_page FUJITA Tomonori
2009-08-10  8:47   ` [tip:core/iommu] sparc: Replace " tip-bot for FUJITA Tomonori
2009-08-10  2:53 ` [PATCH 7/8] sparc: use asm-generic/pci-dma-compat FUJITA Tomonori
2009-08-10  8:47   ` [tip:core/iommu] sparc: Use asm-generic/pci-dma-compat tip-bot for FUJITA Tomonori
2009-08-10  2:53 ` [PATCH 8/8] sparc: add CONFIG_DMA_API_DEBUG support FUJITA Tomonori
2009-08-10  8:47   ` [tip:core/iommu] sparc: Add " tip-bot for FUJITA Tomonori
2009-08-12 23:34 ` [PATCH resend 0/8] sparc: use asm-generic/dma-mapping-common.h and pci-dma-compat.h David Miller
2009-08-13  7:04   ` Ingo Molnar

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=tip-595cc8560783ea31ed1208dc1f97282a2a5606b7@git.kernel.org \
    --to=fujita.tomonori@lab.ntt.co.jp \
    --cc=davem@davemloft.net \
    --cc=hpa@zytor.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-tip-commits@vger.kernel.org \
    --cc=mingo@elte.hu \
    --cc=mingo@redhat.com \
    --cc=reif@earthlink.net \
    --cc=tglx@linutronix.de \
    /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

all inboxes | Powered by JetHome®