[PATCH 2.4] Fixed compile warning about IDE driver

[Yoichi Yuasa]

Hi,

When I was compiling by config of CASIO E55, I found the following warnings.

ide.c:175: warning: `ide_scan_direction' defined but not used
ide-lib.c: In function `ide_rate_filter':
ide-lib.c:174: warning: comparison of distinct pointer types lacks a cast

I made a patch for fixing this warnings.
Please apply this patch to v2.4.

Yoichi

diff -urN -X dontdiff mips-orig/drivers/ide/ide-lib.c mips/drivers/ide/ide-lib.c
--- mips-orig/drivers/ide/ide-lib.c	2004-02-04 12:57:41.000000000 +0900
+++ mips/drivers/ide/ide-lib.c	2004-02-04 12:51:59.000000000 +0900
@@ -171,7 +171,7 @@
 		BUG();
 	return min(speed, speed_max[mode]);
 #else /* !CONFIG_BLK_DEV_IDEDMA */
-	return min(speed, XFER_PIO_4);
+	return min(speed, (u8)XFER_PIO_4);
 #endif /* CONFIG_BLK_DEV_IDEDMA */
 }
 
diff -urN -X dontdiff mips-orig/drivers/ide/ide.c mips/drivers/ide/ide.c
--- mips-orig/drivers/ide/ide.c	2004-02-04 13:00:43.000000000 +0900
+++ mips/drivers/ide/ide.c	2004-02-04 12:51:00.000000000 +0900
@@ -172,7 +172,9 @@
 static int system_bus_speed;	/* holds what we think is VESA/PCI bus speed */
 static int initializing;	/* set while initializing built-in drivers */
 
+#ifdef CONFIG_BLK_DEV_IDEPCI
 static int ide_scan_direction;	/* THIS was formerly 2.2.x pci=reverse */
+#endif
 
 #ifdef CONFIG_IDEDMA_AUTO
 int noautodma = 0;
-
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/