summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorPierre Ossman <drzeus@drzeus.cx>2006-12-23 20:03:02 +0100
committerPierre Ossman <drzeus@drzeus.cx>2007-05-01 13:04:16 +0200
commit98ac2162699f7e9880683cb954891817f20b607c (patch)
tree27452d428e16edfe6d13d71f297adf5376d07bde /drivers
parent29041dbe199b0dff392bf1b9d634357da0b3208f (diff)
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 <drzeus@drzeus.cx>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/mmc/Makefile2
-rw-r--r--drivers/mmc/block.c (renamed from drivers/mmc/mmc_block.c)3
-rw-r--r--drivers/mmc/queue.c (renamed from drivers/mmc/mmc_queue.c)9
-rw-r--r--drivers/mmc/queue.h (renamed from drivers/mmc/mmc_queue.h)0
4 files changed, 7 insertions, 7 deletions
diff --git a/drivers/mmc/Makefile b/drivers/mmc/Makefile
index 83ffb9326a54..9ef010a51608 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
index 63fbde8756ac..8eba037a18e0 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 <asm/system.h>
#include <asm/uaccess.h>
-#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
index c27e42645cdb..aa75ac11a19e 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 <linux/mmc/card.h>
#include <linux/mmc/host.h>
-#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
index c9f139e764f6..c9f139e764f6 100644
--- a/drivers/mmc/mmc_queue.h
+++ b/drivers/mmc/queue.h