diff options
author | Javier Martinez Canillas <martinez.javier@gmail.com> | 2010-07-09 23:25:12 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-08-23 21:15:33 -0400 |
commit | 09e74c794fc9d5064e07c4bf6c9d5458586385c1 (patch) | |
tree | 43a5a96b8f0c03db3359b5434ddf1ca56c9f6dc1 /drivers | |
parent | 9ee47476d6734c9deb9ae9ab05d963302f6b6150 (diff) |
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>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/staging/spectra/ffsport.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/drivers/staging/spectra/ffsport.c b/drivers/staging/spectra/ffsport.c index d0c5c97eda3e..eca65363b23b 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) | |||
272 | return res_blks; | 272 | return res_blks; |
273 | } | 273 | } |
274 | 274 | ||
275 | static void SBD_prepare_flush(struct request_queue *q, struct request *rq) | ||
276 | { | ||
277 | rq->cmd_type = REQ_TYPE_LINUX_BLOCK; | ||
278 | /* rq->timeout = 5 * HZ; */ | ||
279 | rq->cmd[0] = REQ_LB_OP_FLUSH; | ||
280 | } | ||
281 | |||
282 | /* Transfer a full request. */ | 275 | /* Transfer a full request. */ |
283 | static int do_transfer(struct spectra_nand_dev *tr, struct request *req) | 276 | static int do_transfer(struct spectra_nand_dev *tr, struct request *req) |
284 | { | 277 | { |
@@ -650,8 +643,7 @@ static int SBD_setup_device(struct spectra_nand_dev *dev, int which) | |||
650 | /* Here we force report 512 byte hardware sector size to Kernel */ | 643 | /* Here we force report 512 byte hardware sector size to Kernel */ |
651 | blk_queue_logical_block_size(dev->queue, 512); | 644 | blk_queue_logical_block_size(dev->queue, 512); |
652 | 645 | ||
653 | blk_queue_ordered(dev->queue, QUEUE_ORDERED_DRAIN_FLUSH, | 646 | blk_queue_ordered(dev->queue, QUEUE_ORDERED_DRAIN_FLUSH); |
654 | SBD_prepare_flush); | ||
655 | 647 | ||
656 | dev->thread = kthread_run(spectra_trans_thread, dev, "nand_thd"); | 648 | dev->thread = kthread_run(spectra_trans_thread, dev, "nand_thd"); |
657 | if (IS_ERR(dev->thread)) { | 649 | if (IS_ERR(dev->thread)) { |