Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5b5c5d12 authored by Tejun Heo's avatar Tejun Heo Committed by Jens Axboe
Browse files

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: default avatarTejun 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: default avatarJens Axboe <jens.axboe@oracle.com>
parent 4c94dece

drivers/block/amiflop.c

+0 −7
Original line number Diff line number Diff line
@@ -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;

drivers/block/ataflop.c

+0 −4
Original line number Diff line number Diff line
@@ -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();

	}

drivers/block/mg_disk.c

+0 −10
Original line number Diff line number Diff line
@@ -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;

}

drivers/block/xd.c

+2 −7
Original line number Diff line number Diff line
@@ -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);

	}