aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJavier Martinez Canillas <martinez.javier@gmail.com>2010-07-09 23:25:12 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2010-08-23 18:15:33 -0700
commit09e74c794fc9d5064e07c4bf6c9d5458586385c1 (patch)
tree43a5a96b8f0c03db3359b5434ddf1ca56c9f6dc1
parent9ee47476d6734c9deb9ae9ab05d963302f6b6150 (diff)
downloadmrst-s0i3-test-09e74c794fc9d5064e07c4bf6c9d5458586385c1.tar.gz
mrst-s0i3-test-09e74c794fc9d5064e07c4bf6c9d5458586385c1.tar.xz
mrst-s0i3-test-09e74c794fc9d5064e07c4bf6c9d5458586385c1.zip
Staging: spectra: removes q->prepare_flush_fn, fix build breakage
This patch is the first one of a patchset that allows stagin/spectra driver to compile in linux-next. blk_queue_ordered doesn't receive a prepare flush function anymore Signed-off-by: Javier Martinez Canillas <martinez.javier@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/staging/spectra/ffsport.c10
1 files changed, 1 insertions, 9 deletions
diff --git a/drivers/staging/spectra/ffsport.c b/drivers/staging/spectra/ffsport.c
index d0c5c97eda3..eca65363b23 100644
--- a/drivers/staging/spectra/ffsport.c
+++ b/drivers/staging/spectra/ffsport.c
@@ -272,13 +272,6 @@ static int get_res_blk_num_os(void)
return res_blks;
}
-static void SBD_prepare_flush(struct request_queue *q, struct request *rq)
-{
- rq->cmd_type = REQ_TYPE_LINUX_BLOCK;
- /* rq->timeout = 5 * HZ; */
- rq->cmd[0] = REQ_LB_OP_FLUSH;
-}
-
/* Transfer a full request. */
static int do_transfer(struct spectra_nand_dev *tr, struct request *req)
{
@@ -650,8 +643,7 @@ static int SBD_setup_device(struct spectra_nand_dev *dev, int which)
/* Here we force report 512 byte hardware sector size to Kernel */
blk_queue_logical_block_size(dev->queue, 512);
- blk_queue_ordered(dev->queue, QUEUE_ORDERED_DRAIN_FLUSH,
- SBD_prepare_flush);
+ blk_queue_ordered(dev->queue, QUEUE_ORDERED_DRAIN_FLUSH);
dev->thread = kthread_run(spectra_trans_thread, dev, "nand_thd");
if (IS_ERR(dev->thread)) {