lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Staging: spectra: removes q->prepare_flush_fn, fix build breakage

Browse Source 
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>
This commit is contained in:
Javier Martinez Canillas
2010-07-09 23:25:12 -04:00
committed by Greg Kroah-Hartman
parent 9ee47476d6
commit 09e74c794f
1 changed files with 1 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/staging/spectra/ffsport.c
View File

@@ -272,13 +272,6 @@ static int get_res_blk_num_os(void)
return res_blks; 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. */ /* Transfer a full request. */
static int do_transfer(struct spectra_nand_dev *tr, struct request *req) 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 */ /* Here we force report 512 byte hardware sector size to Kernel */
blk_queue_logical_block_size(dev->queue, 512); blk_queue_logical_block_size(dev->queue, 512);
blk_queue_ordered(dev->queue, QUEUE_ORDERED_DRAIN_FLUSH, blk_queue_ordered(dev->queue, QUEUE_ORDERED_DRAIN_FLUSH);
SBD_prepare_flush);
dev->thread = kthread_run(spectra_trans_thread, dev, "nand_thd"); dev->thread = kthread_run(spectra_trans_thread, dev, "nand_thd");
if (IS_ERR(dev->thread)) { if (IS_ERR(dev->thread)) {