Skip to contentSkip to conversation

ide: trivial sparse annotations

PATCH Applied Harvey Harrison 2 participants 2 messages Jul 15, 2008 – Jul 16, 2008 libata

lore
Share & tools
lore
#0 lore raw

PATCH 2/2 ide: trivial sparse annotations

---
 drivers/ide/ide-dma.c  |    2 +-
 drivers/ide/ide-iops.c |    6 ++----
 drivers/ide/ide-proc.c |    4 ++--
 3 files changed, 5 insertions(+), 7 deletions(-)
drivers/ide/ide-dma.c +1 -1
index be99d46..71c377a 100644
@@ -173,7 +173,7 @@ EXPORT_SYMBOL_GPL(ide_build_sglist);
 int ide_build_dmatable (ide_drive_t *drive, struct request *rq)
 {
 	ide_hwif_t *hwif	= HWIF(drive);
-	unsigned int *table	= hwif->dmatable_cpu;
+	__le32 *table = (__le32 *)hwif->dmatable_cpu;
 	unsigned int is_trm290	= (hwif->chipset == ide_trm290) ? 1 : 0;
 	unsigned int count = 0;
 	int i;
drivers/ide/ide-iops.c +2 -4
index 3ae278d..345cd2c 100644
@@ -510,10 +510,8 @@ void ide_fixstring (u8 *s, const int bytecount, const int byteswap)
 
 	if (byteswap) {
 		/* convert from big-endian to host byte order */
-		for (p = end ; p != s;) {
-			unsigned short *pp = (unsigned short *) (p -= 2);
-			*pp = ntohs(*pp);
-		}
+		for (p = end ; p != s;)
+			be16_to_cpus((u16 *)(p -= 2));
 	}
 	/* strip leading blanks */
 	while (s != end && *s == ' ')
drivers/ide/ide-proc.c +2 -2
index 151c91e..f66c9c3 100644
@@ -105,7 +105,7 @@ static int proc_ide_read_identify
 	len = sprintf(page, "\n");
 
 	if (drive) {
-		unsigned short *val = (unsigned short *) page;
+		__le16 *val = (__le16 *)page;
 
 		err = taskfile_lib_get_identify(drive, page);
 		if (!err) {
@@ -113,7 +113,7 @@ static int proc_ide_read_identify
 			page = out;
 			do {
 				out += sprintf(out, "%04x%c",
-					le16_to_cpu(*val), (++i & 7) ? ' ' : '\n');
+					le16_to_cpup(val), (++i & 7) ? ' ' : '\n');
 				val += 1;
 			} while (i < (SECTOR_WORDS * 2));
 			len = out - page;
Signature · 1 line
1.5.6.3.499.geae9