[PATCH] mflash: remove small byteswapping function

[Harvey Harrison]

Byteswap as we read in the data rather than having a
byteswap in place function that is only used once.

MG_SECTOR_SIZE >> 1 == 256 so this should be a no-op.

Signed-off-by: Harvey Harrison <harvey.harrison@xxxxxxxxx>
---
Also, you always call mg_ide_fixstring with byteswap == 1,
I'd suggest removing that parameter and doing it unconditionally.

 drivers/block/mg_disk.c |   17 +----------------
 1 files changed, 1 insertions(+), 16 deletions(-)

diff --git a/drivers/block/mg_disk.c b/drivers/block/mg_disk.c
index 24edc9a..116f2a3 100644
--- a/drivers/block/mg_disk.c
+++ b/drivers/block/mg_disk.c
@@ -141,20 +141,6 @@ static irqreturn_t mg_irq(int irq, void *dev_id)
 	return IRQ_HANDLED;
 }
 
-static void mg_fix_disk_id(u16 *id)
-{
-#ifndef __LITTLE_ENDIAN
-# ifdef __BIG_ENDIAN
-	int i;
-
-	for (i = 0; i < 256; i++)
-		id[i] = __le16_to_cpu(id[i]);
-# else
-#  error "Please fix <asm/byteorder.h>"
-# endif
-#endif
-}
-
 static void mg_ide_fixstring(u8 *s, const int bytecount, const int byteswap)
 {
 	u8 *p, *end = &s[bytecount & ~1]; /* bytecount must be even */
@@ -194,12 +180,11 @@ static int mg_get_disk_id(struct mg_host *host)
 	err = mg_wait(host, MG_REG_STATUS_BIT_DATA_REQ, 3000);
 	if (!err) {
 		for (i = 0; i < (MG_SECTOR_SIZE >> 1); i++)
-			id[i] = inw(host->dev_base + MG_BUFF_OFFSET + i * 2);
+			id[i] = le16_to_cpu(inw(host->dev_base + MG_BUFF_OFFSET + i * 2));
 
 		outb(MG_CMD_RD_CONF, host->dev_base + MG_REG_COMMAND);
 		err = mg_wait(host, MG_STAT_READY, 3000);
 		if (!err) {
-			mg_fix_disk_id(id);
 			if ((host->id_data.field_valid & 1) == 0) {
 				err = MG_ERR_TRANSLATION;
 			} else {
-- 
1.6.1.71.gd5e04



--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/