diff options
| author | Mike Christie <mchristi@redhat.com> | 2016-06-08 15:49:41 -0500 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2016-06-08 15:01:16 -0600 |
| commit | 56332f02a562390a3198525ad78cb4f558805c0f (patch) | |
| tree | 06be0f2c4c46616eb4b625ffb647a1c664547949 | |
| parent | 47b0e50ac724d97c392f771bb46f11d9d1575242 (diff) | |
| download | op-kernel-dev-56332f02a562390a3198525ad78cb4f558805c0f.zip op-kernel-dev-56332f02a562390a3198525ad78cb4f558805c0f.tar.gz | |
mg_disk: fix enum REQ_OP_ kbuild error
Because we define WRITE/READ as REQ_OPs, we cannot do
switch (rq_data_dir(request))
case READ
....
case WRITE
...
without getting warnings about handling other REQ_OPs.
This just has mq_disk do a if/else like it does in other
places.
Signed-off-by: Mike Christie <mchristi@redhat.com>
Signed-off-by: Jens Axboe <axboe@fb.com>
| -rw-r--r-- | drivers/block/mg_disk.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/block/mg_disk.c b/drivers/block/mg_disk.c index 145ce2a..1ee3918 100644 --- a/drivers/block/mg_disk.c +++ b/drivers/block/mg_disk.c @@ -687,15 +687,13 @@ static unsigned int mg_issue_req(struct request *req, unsigned int sect_num, unsigned int sect_cnt) { - switch (rq_data_dir(req)) { - case READ: + if (rq_data_dir(req) == READ) { if (mg_out(host, sect_num, sect_cnt, MG_CMD_RD, &mg_read_intr) != MG_ERR_NONE) { mg_bad_rw_intr(host); return host->error; } - break; - case WRITE: + } else { /* TODO : handler */ outb(ATA_NIEN, (unsigned long)host->dev_base + MG_REG_DRV_CTRL); if (mg_out(host, sect_num, sect_cnt, MG_CMD_WR, &mg_write_intr) @@ -714,7 +712,6 @@ static unsigned int mg_issue_req(struct request *req, mod_timer(&host->timer, jiffies + 3 * HZ); outb(MG_CMD_WR_CONF, (unsigned long)host->dev_base + MG_REG_COMMAND); - break; } return MG_ERR_NONE; } |
