From: Geert Uytterhoeven <geert@linux-m68k.org>
To: Christoph Hellwig <hch@lst.de>,
Marek Szyprowski <m.szyprowski@samsung.com>,
Robin Murphy <robin.murphy@arm.com>,
Arnd Bergmann <arnd@arndb.de>, Mark Brown <broonie@kernel.org>,
Richard Weinberger <richard@nod.at>
Cc: Felipe Balbi <balbi@kernel.org>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
"James E . J . Bottomley" <jejb@linux.vnet.ibm.com>,
"Martin K . Petersen" <martin.petersen@oracle.com>,
iommu@lists.linux-foundation.org, linux-usb@vger.kernel.org,
linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-arch@vger.kernel.org,
Geert Uytterhoeven <geert@linux-m68k.org>
Subject: [PATCH/RFC 5/6] scsi: Add NO_DMA dummies for SCSI DMA mapping API
Date: Tue, 6 Feb 2018 11:14:51 +0100 [thread overview]
Message-ID: <1517912092-15470-6-git-send-email-geert@linux-m68k.org> (raw)
In-Reply-To: <1517912092-15470-1-git-send-email-geert@linux-m68k.org>
Add dummies for scsi_dma_{,un}map(), to allow compile-testing if
NO_DMA=y.
This prevents the following from showing up later:
ERROR: "scsi_dma_unmap" [drivers/firewire/firewire-sbp2.ko] undefined!
ERROR: "scsi_dma_map" [drivers/firewire/firewire-sbp2.ko] undefined!
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
---
include/scsi/scsi_cmnd.h | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/include/scsi/scsi_cmnd.h b/include/scsi/scsi_cmnd.h
index d8d4a902a88dedbc..6a123d1dd2f80624 100644
--- a/include/scsi/scsi_cmnd.h
+++ b/include/scsi/scsi_cmnd.h
@@ -171,8 +171,13 @@ extern void scsi_kunmap_atomic_sg(void *virt);
extern int scsi_init_io(struct scsi_cmnd *cmd);
+#ifdef CONFIG_SCSI_DMA
extern int scsi_dma_map(struct scsi_cmnd *cmd);
extern void scsi_dma_unmap(struct scsi_cmnd *cmd);
+#else /* !CONFIG_SCSI_DMA */
+static inline int scsi_dma_map(struct scsi_cmnd *cmd) { return -ENOSYS; }
+static inline void scsi_dma_unmap(struct scsi_cmnd *cmd) { }
+#endif /* !CONFIG_SCSI_DMA */
static inline unsigned scsi_sg_count(struct scsi_cmnd *cmd)
{
--
2.7.4
next prev parent reply other threads:[~2018-02-06 10:15 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-02-06 10:14 [PATCH/RFC 0/6] Allow compile-testing NO_DMA Geert Uytterhoeven
2018-02-06 10:14 ` [PATCH/RFC 1/6] dma-mapping: Convert NO_DMA get_dma_ops() into a real dummy Geert Uytterhoeven
2018-02-06 10:14 ` [PATCH/RFC 2/6] dma-coherent: Add NO_DMA dummies for managed DMA API Geert Uytterhoeven
2018-02-06 10:14 ` [PATCH/RFC 3/6] usb: gadget: Add NO_DMA dummies for DMA mapping API Geert Uytterhoeven
2018-02-15 13:18 ` Felipe Balbi
2018-02-06 10:14 ` [PATCH/RFC 4/6] mm: Add NO_DMA dummies for DMA pool API Geert Uytterhoeven
2018-02-06 12:47 ` Robin Murphy
2018-02-06 10:14 ` Geert Uytterhoeven [this message]
2018-02-06 10:14 ` [PATCH/RFC 6/6] Treewide: Remove depends on HAS_DMA in case of platform dependency Geert Uytterhoeven
2018-02-15 13:19 ` Felipe Balbi
2018-02-06 12:01 ` [PATCH/RFC 0/6] Allow compile-testing NO_DMA Mark Brown
2018-02-06 13:05 ` Robin Murphy
2018-02-06 15:24 ` Arnd Bergmann
2018-02-06 15:16 ` Arnd Bergmann
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=1517912092-15470-6-git-send-email-geert@linux-m68k.org \
--to=geert@linux-m68k.org \
--cc=arnd@arndb.de \
--cc=balbi@kernel.org \
--cc=broonie@kernel.org \
--cc=gregkh@linuxfoundation.org \
--cc=hch@lst.de \
--cc=iommu@lists.linux-foundation.org \
--cc=jejb@linux.vnet.ibm.com \
--cc=linux-arch@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=m.szyprowski@samsung.com \
--cc=martin.petersen@oracle.com \
--cc=richard@nod.at \
--cc=robin.murphy@arm.com \
/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;
as well as URLs for NNTP newsgroup(s).