Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1533567 > unrolled thread
| Started by | Arnd Bergmann <arnd@arndb.de> |
|---|---|
| First post | 2016-11-30 22:10 +0100 |
| Last post | 2016-12-01 09:10 +0100 |
| Articles | 2 — 2 participants |
Back to article view | Back to linux.kernel
[PATCH] mmc: queue: add #ifdef around bounce buffer code Arnd Bergmann <arnd@arndb.de> - 2016-11-30 22:10 +0100
Re: [PATCH] mmc: queue: add #ifdef around bounce buffer code Ulf Hansson <ulf.hansson@linaro.org> - 2016-12-01 09:10 +0100
| From | Arnd Bergmann <arnd@arndb.de> |
|---|---|
| Date | 2016-11-30 22:10 +0100 |
| Subject | [PATCH] mmc: queue: add #ifdef around bounce buffer code |
| Message-ID | <sJkiB-2NQ-9@gated-at.bofh.it> |
The two functions that got split out from the bounce
buffer handling are now unused when CONFIG_MMC_BLOCK_BOUNCE
is disabled:
mmc/card/queue.c:212:12: error: 'mmc_queue_alloc_bounce_sgs' defined but not used [-Werror=unused-function]
mmc/card/queue.c:189:13: error: 'mmc_queue_alloc_bounce_bufs' defined but not used [-Werror=unused-function]
This adds a new #ifdef around them.
Fixes: 0a6321310492 ("mmc: queue: Factor out mmc_queue_alloc_bounce_bufs()")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
drivers/mmc/card/queue.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/mmc/card/queue.c b/drivers/mmc/card/queue.c
index 8d10fab701b6..6ae6bfb8b221 100644
--- a/drivers/mmc/card/queue.c
+++ b/drivers/mmc/card/queue.c
@@ -186,6 +186,7 @@ static void mmc_queue_setup_discard(struct request_queue *q,
queue_flag_set_unlocked(QUEUE_FLAG_SECERASE, q);
}
+#ifdef CONFIG_MMC_BLOCK_BOUNCE
static bool mmc_queue_alloc_bounce_bufs(struct mmc_queue *mq,
unsigned int bouncesz)
{
@@ -226,6 +227,7 @@ static int mmc_queue_alloc_bounce_sgs(struct mmc_queue *mq,
return 0;
}
+#endif
static int mmc_queue_alloc_sgs(struct mmc_queue *mq, int max_segs)
{
--
2.9.0
[toc] | [next] | [standalone]
| From | Ulf Hansson <ulf.hansson@linaro.org> |
|---|---|
| Date | 2016-12-01 09:10 +0100 |
| Message-ID | <sJuBk-1bE-13@gated-at.bofh.it> |
| In reply to | #1533567 |
On 30 November 2016 at 22:03, Arnd Bergmann <arnd@arndb.de> wrote:
> The two functions that got split out from the bounce
> buffer handling are now unused when CONFIG_MMC_BLOCK_BOUNCE
> is disabled:
>
> mmc/card/queue.c:212:12: error: 'mmc_queue_alloc_bounce_sgs' defined but not used [-Werror=unused-function]
> mmc/card/queue.c:189:13: error: 'mmc_queue_alloc_bounce_bufs' defined but not used [-Werror=unused-function]
>
> This adds a new #ifdef around them.
>
> Fixes: 0a6321310492 ("mmc: queue: Factor out mmc_queue_alloc_bounce_bufs()")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Thanks for the fix. This time I have already amended the changes that
causes the problem and pushed them for next by yesterday.
Kind regards
Uffe
> ---
> drivers/mmc/card/queue.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/drivers/mmc/card/queue.c b/drivers/mmc/card/queue.c
> index 8d10fab701b6..6ae6bfb8b221 100644
> --- a/drivers/mmc/card/queue.c
> +++ b/drivers/mmc/card/queue.c
> @@ -186,6 +186,7 @@ static void mmc_queue_setup_discard(struct request_queue *q,
> queue_flag_set_unlocked(QUEUE_FLAG_SECERASE, q);
> }
>
> +#ifdef CONFIG_MMC_BLOCK_BOUNCE
> static bool mmc_queue_alloc_bounce_bufs(struct mmc_queue *mq,
> unsigned int bouncesz)
> {
> @@ -226,6 +227,7 @@ static int mmc_queue_alloc_bounce_sgs(struct mmc_queue *mq,
>
> return 0;
> }
> +#endif
>
> static int mmc_queue_alloc_sgs(struct mmc_queue *mq, int max_segs)
> {
> --
> 2.9.0
>
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web