linux-mmc.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Paul Parsons" <lost.distance@yahoo.com>
To: linux-mmc@vger.kernel.org
Cc: ian@mnementh.co.uk
Subject: [PATCH] mmc: tmio: Fix build errors
Date: Sun, 15 May 2011 13:24:52 +0000	[thread overview]
Message-ID: <E1QLbJV-0007eN-AF@outmx05.plus.net> (raw)

Conditional code in tmio_mmc.h selects dummy tmio_mmc_start_dma(), tmio_mmc_request_dma() and tmio_mmc_release_dma() inline functions instead of the required declarations. This breaks the build of tmio_mmc_dma.c

Signed-off-by: Paul Parsons <lost.distance@yahoo.com>
---
diff -uprN clean-2.6.39-rc7/drivers/mmc/host/tmio_mmc.h linux-2.6.39-rc7/drivers/mmc/host/tmio_mmc.h
--- clean-2.6.39-rc7/drivers/mmc/host/tmio_mmc.h	2011-05-11 00:54:17.647289808 +0100
+++ linux-2.6.39-rc7/drivers/mmc/host/tmio_mmc.h	2011-05-14 16:30:47.208267896 +0100
@@ -98,26 +98,8 @@ static inline void tmio_mmc_kunmap_atomi
 	local_irq_restore(*flags);
 }
 
-#if defined(CONFIG_MMC_SDHI) || defined(CONFIG_MMC_SDHI_MODULE)
 void tmio_mmc_start_dma(struct tmio_mmc_host *host, struct mmc_data *data);
 void tmio_mmc_request_dma(struct tmio_mmc_host *host, struct tmio_mmc_data *pdata);
 void tmio_mmc_release_dma(struct tmio_mmc_host *host);
-#else
-static inline void tmio_mmc_start_dma(struct tmio_mmc_host *host,
-			       struct mmc_data *data)
-{
-}
-
-static inline void tmio_mmc_request_dma(struct tmio_mmc_host *host,
-				 struct tmio_mmc_data *pdata)
-{
-	host->chan_tx = NULL;
-	host->chan_rx = NULL;
-}
-
-static inline void tmio_mmc_release_dma(struct tmio_mmc_host *host)
-{
-}
-#endif
 
 #endif


             reply	other threads:[~2011-05-15 13:24 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-05-15 13:24 Paul Parsons [this message]
2011-05-16 21:07 ` [PATCH] mmc: tmio: Fix build errors Guennadi Liakhovetski
2011-05-16 21:49   ` Paul Parsons
2011-05-16 22:01     ` Guennadi Liakhovetski

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=E1QLbJV-0007eN-AF@outmx05.plus.net \
    --to=lost.distance@yahoo.com \
    --cc=ian@mnementh.co.uk \
    --cc=linux-mmc@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;
as well as URLs for NNTP newsgroup(s).