aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/block/amiflop.c
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2009-04-28 00:06:06 -0400
committerJens Axboe <jens.axboe@oracle.com>2009-04-28 02:14:50 -0400
commit5b5c5d12b91cb6b2a2967f06aef35d59008dc2e7 (patch)
treeea8397d10aaedda61fcc849ce9a7fcab17b5438b /drivers/block/amiflop.c
parent4c94dece1baf320d925cedb231489c4e0358ac5a (diff)
amiflop,ataflop,xd,mg_disk: clean up unnecessary stuff from block drivers
rq_data_dir() can only be READ or WRITE and rq->sector and nr_sectors are always automatically updated after partial request completion. Don't worry about rq_data_dir() not being either READ or WRITE or manually update sector and nr_sectors. [ Impact: cleanup ] Signed-off-by: Tejun Heo <tj@kernel.org> Cc: Jörg Dorchain <joerg@dorchain.net> Cc: Geert Uytterhoeven <geert@linux-m68k.org> Cc: unsik Kim <donari75@gmail.com> Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'drivers/block/amiflop.c')
-rw-r--r--drivers/block/amiflop.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/block/amiflop.c b/drivers/block/amiflop.c
index b99a2a606d02..8ff95f2c0ede 100644
--- a/drivers/block/amiflop.c
+++ b/drivers/block/amiflop.c
@@ -1371,11 +1371,6 @@ static void redo_fd_request(void)
1371 "0x%08lx\n", track, sector, data); 1371 "0x%08lx\n", track, sector, data);
1372#endif 1372#endif
1373 1373
1374 if ((rq_data_dir(CURRENT) != READ) && (rq_data_dir(CURRENT) != WRITE)) {
1375 printk(KERN_WARNING "do_fd_request: unknown command\n");
1376 __blk_end_request_cur(CURRENT, -EIO);
1377 goto repeat;
1378 }
1379 if (get_track(drive, track) == -1) { 1374 if (get_track(drive, track) == -1) {
1380 __blk_end_request_cur(CURRENT, -EIO); 1375 __blk_end_request_cur(CURRENT, -EIO);
1381 goto repeat; 1376 goto repeat;
@@ -1407,8 +1402,6 @@ static void redo_fd_request(void)
1407 break; 1402 break;
1408 } 1403 }
1409 } 1404 }
1410 CURRENT->nr_sectors -= CURRENT->current_nr_sectors;
1411 CURRENT->sector += CURRENT->current_nr_sectors;
1412 1405
1413 __blk_end_request_cur(CURRENT, 0); 1406 __blk_end_request_cur(CURRENT, 0);
1414 goto repeat; 1407 goto repeat;