linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Arnd Bergmann <arnd@arndb.de>
To: linux-arm-kernel@lists.infradead.org
Cc: linux-kernel@vger.kernel.org, Arnd Bergmann <arnd@arndb.de>,
	Tony Lindgren <tony@atomide.com>,
	Russell King <rmk+kernel@arm.linux.org.uk>,
	Vinod Koul <vinod.koul@intel.com>,
	dmaengine@vger.kernel.org
Subject: [PATCH 1/2] dmaengine: omap: hide filter_fn for built-in drivers
Date: Thu,  8 May 2014 16:56:12 +0200	[thread overview]
Message-ID: <1399560990-1402858-1-git-send-email-arnd@arndb.de> (raw)
In-Reply-To: <1399560433-1402630-1-git-send-email-arnd@arndb.de>

It is not possible to reference the omap_dma_filter_fn filter
function from a built-in driver if the dmaengine driver itself
is a loadable module, which is a valid configuration otherwise.

This provides only the dummy alternative if the function
is referenced by a built-in driver to allow a successful
build. The filter function is only required by ATAGS based
platforms, which will continue to be broken after this change
for the bogus configuration. When booting from DT, with the
dma channels correctly listed there, it will work fine.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Tony Lindgren <tony@atomide.com>
Cc: Russell King <rmk+kernel@arm.linux.org.uk>
Cc: Vinod Koul <vinod.koul@intel.com>
Cc: dmaengine@vger.kernel.org
---
 include/linux/omap-dma.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/linux/omap-dma.h b/include/linux/omap-dma.h
index 0a1a2e2..c29a6de 100644
--- a/include/linux/omap-dma.h
+++ b/include/linux/omap-dma.h
@@ -10,7 +10,7 @@
 
 struct dma_chan;
 
-#if defined(CONFIG_DMA_OMAP) || defined(CONFIG_DMA_OMAP_MODULE)
+#if defined(CONFIG_DMA_OMAP) || (defined(CONFIG_DMA_OMAP_MODULE) && defined(MODULE))
 bool omap_dma_filter_fn(struct dma_chan *, void *);
 #else
 static inline bool omap_dma_filter_fn(struct dma_chan *c, void *d)
-- 
1.8.3.2


  parent reply	other threads:[~2014-05-08 15:02 UTC|newest]

Thread overview: 96+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-05-08 14:46 [PATCH 00/22] Random ARM randconfig fixes in drivers Arnd Bergmann
2014-05-08 14:46 ` [PATCH] mdio_bus: fix devm_mdiobus_alloc_size export Arnd Bergmann
2014-05-08 17:01   ` Grygorii Strashko
2014-05-09  7:06   ` Prabhakar Lad
2014-05-09 20:39   ` David Miller
2014-05-08 14:46 ` [PATCH 1/2] phy: kona2: use 'select GENERIC_PHY' in Kconfig Arnd Bergmann
2014-05-08 14:46 ` [PATCH 2/2] phy: exynos: fix SATA phy license typo Arnd Bergmann
2014-05-08 18:46   ` Paul Bolle
2014-05-08 14:56 ` Arnd Bergmann [this message]
2014-05-08 14:56   ` [PATCH 2/2] dmaengine: sa11x0: remove broken #ifdef Arnd Bergmann
2014-05-08 16:08     ` Shevchenko, Andriy
2014-05-21  6:05       ` Vinod Koul
2014-05-08 14:56   ` [PATCH 1/2] mtd/onenand: fix build warning for dma type Arnd Bergmann
2014-05-12 23:26     ` Brian Norris
2014-05-08 14:56   ` [PATCH 2/2] mtd: orion-nand: fix build error with ARMv4 Arnd Bergmann
2014-05-09 18:45     ` Ezequiel Garcia
2014-05-09 19:29       ` Geert Uytterhoeven
2014-05-09 20:12       ` Arnd Bergmann
2014-05-09 21:28       ` Jason Gunthorpe
2014-05-09 22:09         ` Ezequiel Garcia
2014-05-09 22:24           ` Arnd Bergmann
2014-05-09 23:55             ` Ezequiel Garcia
2014-05-13 20:55           ` Jason Gunthorpe
2014-05-14 11:47             ` Arnd Bergmann
2014-05-14 12:35               ` Geert Uytterhoeven
2014-05-14 13:09                 ` Arnd Bergmann
2014-05-08 14:56   ` [PATCH] clk/versatile: export symbols for impd1 Arnd Bergmann
2014-05-08 21:09     ` Linus Walleij
2014-05-15  6:41     ` Mike Turquette
2014-05-08 14:56   ` [PATCH] bus/omap_l3: avoid sync initcall for modules Arnd Bergmann
2014-05-12 22:20     ` Tony Lindgren
2014-05-13 15:12       ` Arnd Bergmann
2014-05-13 16:27         ` Tony Lindgren
2014-05-14 17:39           ` Greg KH
2014-05-14 18:15             ` Arnd Bergmann
2014-05-15  0:11               ` Tony Lindgren
2014-05-08 14:56   ` [PATCH] bus/arm-cci: add dependency on OF && CPU_V7 Arnd Bergmann
2014-05-09  9:31     ` Lorenzo Pieralisi
2014-05-08 14:56   ` [PATCH] watchdog: iop_wdt only builds for mach-iop13xx Arnd Bergmann
2014-05-08 16:42     ` Guenter Roeck
2014-05-26 21:02     ` Wim Van Sebroeck
2014-05-08 14:56   ` [PATCH] mpilib: use 'static inline' for mpi-inline.h Arnd Bergmann
2014-05-08 15:30     ` Steven Rostedt
2014-05-09  1:17       ` Behan Webster
2014-05-08 14:56   ` [PATCH] ata: pata_at91 only works on sam9 Arnd Bergmann
2014-05-08 15:00     ` Tejun Heo
2014-05-08 14:56   ` [PATCH] i2c/nuc900: fix ancient build error Arnd Bergmann
2014-05-09 22:23     ` Mark Roszko
2014-05-14 16:27     ` Wolfram Sang
2014-05-14 18:14       ` Arnd Bergmann
2014-05-14 19:17         ` Wolfram Sang
2014-05-21 10:49           ` Wolfram Sang
2014-05-08 14:56   ` [PATCH 1/2] iio: always select ANON_INODES Arnd Bergmann
2014-05-10 10:40     ` Jonathan Cameron
2014-05-08 14:56   ` [PATCH 2/2] iio:adc: at91 requires the input subsystem Arnd Bergmann
2014-05-08 17:22     ` Alexandre Belloni
2014-05-08 17:31       ` Lars-Peter Clausen
2014-05-09 10:01     ` Nicolas Ferre
2014-05-09 11:43       ` [PATCH v2 " Arnd Bergmann
2014-05-09 12:57         ` Nicolas Ferre
2014-05-10 10:42           ` Jonathan Cameron
2014-05-08 14:56   ` [PATCH] pci: rcar host needs OF Arnd Bergmann
2014-05-08 15:06     ` Ben Dooks
2014-05-08 15:16       ` Geert Uytterhoeven
2014-05-08 15:21         ` Arnd Bergmann
2014-05-09  6:59           ` Arnd Bergmann
2014-05-27 22:54     ` Bjorn Helgaas
2014-05-28  1:37       ` Jingoo Han
2014-05-08 14:56   ` [PATCH 1/2] input: fix ps2/serio module dependency Arnd Bergmann
2014-05-08 15:59     ` Dmitry Torokhov
2014-05-09  7:34       ` Arnd Bergmann
2014-05-08 14:56   ` [PATCH 2/2] input: atmel-wm97xx: only build for AVR32 Arnd Bergmann
2014-05-12 13:16     ` Nicolas Ferre
2014-05-08 14:56   ` [PATCH] misc: atmel_pwm: only build for supported platforms Arnd Bergmann
2014-05-09 10:03     ` Nicolas Ferre
2014-05-28 12:24       ` Paul Bolle
2014-05-28 15:59         ` Alexandre Belloni
2014-05-28 16:09           ` Paul Bolle
2014-05-28 17:55             ` Alexandre Belloni
2014-05-28 17:59               ` Paul Bolle
2014-05-28 18:42                 ` Greg Kroah-Hartman
2014-05-28 23:19                   ` Alexandre Belloni
2014-06-18  9:19                   ` Paul Bolle
2014-06-18  9:31                     ` Alexandre Belloni
2014-06-25  9:43                       ` [PATCH] misc: atmel_pwm: fix Kconfig symbols Nicolas Ferre
2014-06-25 10:48                         ` Alexandre Belloni
2014-05-08 14:56   ` [PATCH] remoteproc: da8xx: don't select CMA on no-MMU Arnd Bergmann
2014-05-12 13:09     ` Ohad Ben-Cohen
2014-05-12 18:04       ` Arnd Bergmann
2014-05-12 18:07         ` Ohad Ben-Cohen
2014-05-08 14:56   ` [PATCH] regulator: arizona-ldo1: add missing #include Arnd Bergmann
2014-05-08 16:19     ` Charles Keepax
2014-05-12 22:17   ` [PATCH 1/2] dmaengine: omap: hide filter_fn for built-in drivers Tony Lindgren
2014-05-21  6:11   ` Vinod Koul
2014-05-08 16:41 ` [PATCH 00/22] Random ARM randconfig fixes in drivers Guenter Roeck
2014-05-09 11:48   ` 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=1399560990-1402858-1-git-send-email-arnd@arndb.de \
    --to=arnd@arndb.de \
    --cc=dmaengine@vger.kernel.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=rmk+kernel@arm.linux.org.uk \
    --cc=tony@atomide.com \
    --cc=vinod.koul@intel.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).