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>

diff --git a/drivers/block/amiflop.c b/drivers/block/amiflop.c
index b99a2a606d022cb67b5aba172d7968d1b9442461..8ff95f2c0ede2819886b78c4131daf1af056e971 100644 (file)
--- a/drivers/block/amiflop.c
+++ b/drivers/block/amiflop.c
@@ -1371,11 +1371,6 @@ static void redo_fd_request(void)
                       "0x%08lx\n", track, sector, data);
 #endif
 
-               if ((rq_data_dir(CURRENT) != READ) && (rq_data_dir(CURRENT) != WRITE)) {
-                       printk(KERN_WARNING "do_fd_request: unknown command\n");
-                       __blk_end_request_cur(CURRENT, -EIO);
-                       goto repeat;
-               }
                if (get_track(drive, track) == -1) {
                        __blk_end_request_cur(CURRENT, -EIO);
                        goto repeat;
@@ -1407,8 +1402,6 @@ static void redo_fd_request(void)
                        break;
                }
        }
-       CURRENT->nr_sectors -= CURRENT->current_nr_sectors;
-       CURRENT->sector += CURRENT->current_nr_sectors;
 
        __blk_end_request_cur(CURRENT, 0);
        goto repeat;

diff --git a/drivers/block/ataflop.c b/drivers/block/ataflop.c
index 44a8702136a9a95da00cbe9ad2abb0fa272fd50d..25067287211fba3a7058e90c9753304fd16d1974 100644 (file)
--- a/drivers/block/ataflop.c
+++ b/drivers/block/ataflop.c
@@ -732,8 +732,6 @@ static void do_fd_action( int drive )
                    }
                    else {
                        /* all sectors finished */
-                       CURRENT->nr_sectors -= CURRENT->current_nr_sectors;
-                       CURRENT->sector += CURRENT->current_nr_sectors;
                        __blk_end_request_cur(CURRENT, 0);
                        redo_fd_request();
                        return;
@@ -1139,8 +1137,6 @@ static void fd_rwsec_done1(int status)
        }
        else {
                /* all sectors finished */
-               CURRENT->nr_sectors -= CURRENT->current_nr_sectors;
-               CURRENT->sector += CURRENT->current_nr_sectors;
                __blk_end_request_cur(CURRENT, 0);
                redo_fd_request();
        }

diff --git a/drivers/block/mg_disk.c b/drivers/block/mg_disk.c
index 408c2bd8a439b321c7fd54d27268b9c027140464..2c00ad90cd62ed47446205b620007505c4da448d 100644 (file)
--- a/drivers/block/mg_disk.c
+++ b/drivers/block/mg_disk.c
@@ -560,11 +560,6 @@ static void mg_request_poll(struct request_queue *q)
                        case WRITE:
                                mg_write(req);
                                break;
-                       default:
-                               printk(KERN_WARNING "%s:%d unknown command\n",
-                                               __func__, __LINE__);
-                               __blk_end_request_cur(req, -EIO);
-                               break;
                        }
                }
        }
@@ -614,11 +609,6 @@ static unsigned int mg_issue_req(struct request *req,
                outb(MG_CMD_WR_CONF, (unsigned long)host->dev_base +
                                MG_REG_COMMAND);
                break;
-       default:
-               printk(KERN_WARNING "%s:%d unknown command\n",
-                               __func__, __LINE__);
-               __blk_end_request_cur(req, -EIO);
-               break;
        }
        return MG_ERR_NONE;
 }

diff --git a/drivers/block/xd.c b/drivers/block/xd.c
index 6f6ad82ec0c0ab7de8e46324f7f8d79c1841656b..14be4c1ed1aaf53b57c7f62f4010e9b888f116a7 100644 (file)
--- a/drivers/block/xd.c
+++ b/drivers/block/xd.c
@@ -308,7 +308,6 @@ static void do_xd_request (struct request_queue * q)
        while ((req = elv_next_request(q)) != NULL) {
                unsigned block = req->sector;
                unsigned count = req->nr_sectors;
-               int rw = rq_data_dir(req);
                XD_INFO *disk = req->rq_disk->private_data;
                int res = 0;
                int retry;
@@ -321,13 +320,9 @@ static void do_xd_request (struct request_queue * q)
                        __blk_end_request_cur(req, -EIO);
                        continue;
                }
-               if (rw != READ && rw != WRITE) {
-                       printk("do_xd_request: unknown request\n");
-                       __blk_end_request_cur(req, -EIO);
-                       continue;
-               }
                for (retry = 0; (retry < XD_RETRIES) && !res; retry++)
-                       res = xd_readwrite(rw, disk, req->buffer, block, count);
+                       res = xd_readwrite(rq_data_dir(req), disk, req->buffer,
+                                          block, count);
                /* wrap up, 0 = success, -errno = fail */
                __blk_end_request_cur(req, res);
        }