[PATCH 2/2] mci: remove unnecessary loops

[Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>]

We used to loop around the sectors in mci_sd_write/mci_sd_read.
Now that we have multi block read and write this is not necessary
anymore.

Signed-off-by: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>
---
 drivers/mci/mci-core.c |   51 +++++++++++++++++++----------------------------
 1 files changed, 21 insertions(+), 30 deletions(-)

diff --git a/drivers/mci/mci-core.c b/drivers/mci/mci-core.c
index 58f7f6d..651bcbf 100644
--- a/drivers/mci/mci-core.c
+++ b/drivers/mci/mci-core.c
@@ -988,21 +988,17 @@ static int mci_sd_write(struct device_d *disk_dev, uint64_t sector_start,
 		return -EINVAL;
 	}
 
-	while (sector_count) {
-		/* size of the block number field in the MMC/SD command is 32 bit only */
-		if (sector_start > MAX_BUFFER_NUMBER) {
-			pr_debug("Cannot handle block number %llu. Too large!\n",
-				sector_start);
-			return -EINVAL;
-		}
-		rc = mci_block_write(mci_dev, buffer, sector_start);
-		if (rc != 0) {
-			pr_debug("Writing block %u failed with %d\n", (unsigned)sector_start, rc);
-			return rc;
-		}
-		sector_count--;
-		buffer += mci->write_bl_len;
-		sector_start++;
+	/* size of the block number field in the MMC/SD command is 32 bit only */
+	if (sector_start > MAX_BUFFER_NUMBER) {
+		pr_debug("Cannot handle block number %llu. Too large!\n",
+			sector_start);
+		return -EINVAL;
+	}
+
+	rc = mci_block_write(mci_dev, buffer, sector_start, sector_count);
+	if (rc != 0) {
+		pr_debug("Writing block %u failed with %d\n", (unsigned)sector_start, rc);
+		return rc;
 	}
 
 	return 0;
@@ -1036,21 +1032,16 @@ static int mci_sd_read(struct device_d *disk_dev, uint64_t sector_start,
 		return -EINVAL;
 	}
 
-	while (sector_count) {
-		int now = min(sector_count, 32U);
-		if (sector_start > MAX_BUFFER_NUMBER) {
-			pr_err("Cannot handle block number %u. Too large!\n",
-				(unsigned)sector_start);
-			return -EINVAL;
-		}
-		rc = mci_read_block(mci_dev, buffer, (unsigned)sector_start, now);
-		if (rc != 0) {
-			pr_debug("Reading block %u failed with %d\n", (unsigned)sector_start, rc);
-			return rc;
-		}
-		sector_count -= now;
-		buffer += mci->read_bl_len * now;
-		sector_start += now;
+	if (sector_start > MAX_BUFFER_NUMBER) {
+		pr_err("Cannot handle block number %u. Too large!\n",
+			(unsigned)sector_start);
+		return -EINVAL;
+	}
+
+	rc = mci_read_block(mci_dev, buffer, (unsigned)sector_start, sector_count);
+	if (rc != 0) {
+		pr_debug("Reading block %u failed with %d\n", (unsigned)sector_start, rc);
+		return rc;
 	}
 
 	return 0;
-- 
1.7.7.1


_______________________________________________
barebox mailing list
barebox@xxxxxxxxxxxxxxxxxxx
http://lists.infradead.org/mailman/listinfo/barebox