From: Pierre Ossman Date: Sat, 23 Dec 2006 19:03:02 +0000 (+0100) Subject: mmc: Move queue functions to mmc_block X-Git-Tag: v2.6.22-rc1~1032^2~19 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=98ac2162699f7e9880683cb954891817f20b607c;p=linux-2.6 mmc: Move queue functions to mmc_block The mmc block queue functions are tailored for the mmc_block driver, so move those functions into that module. Signed-off-by: Pierre Ossman --- diff --git a/drivers/mmc/Makefile b/drivers/mmc/Makefile index 83ffb9326a..9ef010a516 100644 --- a/drivers/mmc/Makefile +++ b/drivers/mmc/Makefile @@ -11,6 +11,7 @@ obj-$(CONFIG_MMC) += mmc_core.o # Media drivers # obj-$(CONFIG_MMC_BLOCK) += mmc_block.o +mmc_block-objs := block.o queue.o # # Host drivers @@ -26,7 +27,6 @@ obj-$(CONFIG_MMC_AT91) += at91_mci.o obj-$(CONFIG_MMC_TIFM_SD) += tifm_sd.o mmc_core-y := mmc.o mmc_sysfs.o -mmc_core-$(CONFIG_BLOCK) += mmc_queue.o ifeq ($(CONFIG_MMC_DEBUG),y) EXTRA_CFLAGS += -DDEBUG diff --git a/drivers/mmc/mmc_block.c b/drivers/mmc/block.c similarity index 99% rename from drivers/mmc/mmc_block.c rename to drivers/mmc/block.c index 63fbde8756..8eba037a18 100644 --- a/drivers/mmc/mmc_block.c +++ b/drivers/mmc/block.c @@ -2,6 +2,7 @@ * Block driver for media (i.e., flash cards) * * Copyright 2002 Hewlett-Packard Company + * Copyright 2005-2007 Pierre Ossman * * Use consistent with the GNU GPL is permitted, * provided that this copyright notice is @@ -37,7 +38,7 @@ #include #include -#include "mmc_queue.h" +#include "queue.h" /* * max 8 partitions per card diff --git a/drivers/mmc/mmc_queue.c b/drivers/mmc/queue.c similarity index 97% rename from drivers/mmc/mmc_queue.c rename to drivers/mmc/queue.c index c27e42645c..aa75ac11a1 100644 --- a/drivers/mmc/mmc_queue.c +++ b/drivers/mmc/queue.c @@ -1,7 +1,8 @@ /* - * linux/drivers/mmc/mmc_queue.c + * linux/drivers/mmc/queue.c * * Copyright (C) 2003 Russell King, All Rights Reserved. + * Copyright 2006-2007 Pierre Ossman * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as @@ -14,7 +15,7 @@ #include #include -#include "mmc_queue.h" +#include "queue.h" #define MMC_QUEUE_SUSPENDED (1 << 0) @@ -179,7 +180,6 @@ int mmc_init_queue(struct mmc_queue *mq, struct mmc_card *card, spinlock_t *lock blk_cleanup_queue(mq->queue); return ret; } -EXPORT_SYMBOL(mmc_init_queue); void mmc_cleanup_queue(struct mmc_queue *mq) { @@ -226,7 +226,6 @@ void mmc_queue_suspend(struct mmc_queue *mq) down(&mq->thread_sem); } } -EXPORT_SYMBOL(mmc_queue_suspend); /** * mmc_queue_resume - resume a previously suspended MMC request queue @@ -247,4 +246,4 @@ void mmc_queue_resume(struct mmc_queue *mq) spin_unlock_irqrestore(q->queue_lock, flags); } } -EXPORT_SYMBOL(mmc_queue_resume); + diff --git a/drivers/mmc/mmc_queue.h b/drivers/mmc/queue.h similarity index 100% rename from drivers/mmc/mmc_queue.h rename to drivers/mmc/queue.h