From: David Brownell <dbrownell@users.sourceforge.net>
Date: Thu, 28 Jul 2005 10:32:38 +0000 (-0700)
Subject: [PATCH] ARM: OMAP: misc cleanup patches
X-Git-Tag: v2.6.13-omap1~38
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=9fe1dbdbcd7c3c7cb6df08169da522cbd0b2e72d;p=linux-2.6-omap-h63xx.git

[PATCH] ARM: OMAP: misc cleanup patches

This fixes various build warnings I noticed in the latest tree,
and provides saner reports of DPLL1 and MPU clock rates (they
weren't really in MHz).
---

diff --git a/arch/arm/plat-omap/clock.c b/arch/arm/plat-omap/clock.c
index 0904e0458e5..aca608c3e43 100644
--- a/arch/arm/plat-omap/clock.c
+++ b/arch/arm/plat-omap/clock.c
@@ -1224,9 +1224,11 @@ int __init clk_init(void)
 #endif
 	/* Cache rates for clocks connected to ck_ref (not dpll1) */
 	propagate_rate(&ck_ref);
-	printk(KERN_INFO "Clocking rate (xtal/DPLL1/MPU): %ld.%01ld/%ld/%ld MHz\n",
+	printk(KERN_INFO "Clocking rate (xtal/DPLL1/MPU): "
+		"%ld.%01ld/%ld.%01ld/%ld.%01ld MHz\n",
 	       ck_ref.rate / 1000000, (ck_ref.rate / 100000) % 10,
-	       ck_dpll1.rate, arm_ck.rate);
+	       ck_dpll1.rate / 1000000, (ck_dpll1.rate / 100000) % 10,
+	       arm_ck.rate / 1000000, (arm_ck.rate / 100000) % 10);
 
 #ifdef CONFIG_MACH_OMAP_PERSEUS2
 	/* Select slicer output as OMAP input clock */
diff --git a/arch/arm/plat-omap/common.c b/arch/arm/plat-omap/common.c
index 62fc86c39b5..49a8cf46b0f 100644
--- a/arch/arm/plat-omap/common.c
+++ b/arch/arm/plat-omap/common.c
@@ -26,6 +26,7 @@
 #include <asm/hardware/clock.h>
 #include <asm/io.h>
 #include <asm/mach-types.h>
+#include <asm/setup.h>
 
 #include <asm/arch/board.h>
 #include <asm/arch/mux.h>
diff --git a/drivers/char/watchdog/omap1610_wdt.c b/drivers/char/watchdog/omap1610_wdt.c
index 431a3e62777..1a0a33ae5a8 100644
--- a/drivers/char/watchdog/omap1610_wdt.c
+++ b/drivers/char/watchdog/omap1610_wdt.c
@@ -267,13 +267,14 @@ omap1610_wdt_shutdown(struct device *dev)
 	omap_wdt_disable();
 }
 
-static void __exit
+static int __exit
 omap1610_wdt_remove(struct device *dev)
 {
 	struct resource *mem = dev_get_drvdata(dev);
 	misc_deregister(&omap_wdt_miscdev);
 	release_resource(mem);
 	clk_put(armwdt_ck);
+	return 0;
 }
 
 #ifdef	CONFIG_PM
diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c
index fe30caee8b9..4ab070e31ed 100644
--- a/drivers/i2c/busses/i2c-omap.c
+++ b/drivers/i2c/busses/i2c-omap.c
@@ -508,7 +508,7 @@ do_release_region:
 	return r;
 }
 
-static void __exit
+static int __exit
 omap_i2c_remove(struct device *dev)
 {
 	struct platform_device	*pdev = to_platform_device(dev);
@@ -519,6 +519,7 @@ omap_i2c_remove(struct device *dev)
 	free_irq(INT_I2C, &omap_i2c_dev);
 	mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
 	release_mem_region(mem->start, (mem->end - mem->start) + 1);
+	return 0;
 }
 
 static struct device_driver omap_i2c_driver = {
diff --git a/drivers/i2c/chips/tlv320aic23.c b/drivers/i2c/chips/tlv320aic23.c
index 586dc8f2ef9..43c4bac5b53 100644
--- a/drivers/i2c/chips/tlv320aic23.c
+++ b/drivers/i2c/chips/tlv320aic23.c
@@ -32,7 +32,6 @@
 
 /* I2C Addresses to scan */
 static unsigned short normal_i2c[] = { TLV320AIC23ID1, TLV320AIC23ID2, I2C_CLIENT_END };
-static unsigned short normal_i2c_range[] = { I2C_CLIENT_END };
 
 /* This makes all addr_data:s */
 I2C_CLIENT_INSMOD;
diff --git a/drivers/i2c/chips/tps65010.c b/drivers/i2c/chips/tps65010.c
index ca6616b4b96..f7210e7c253 100644
--- a/drivers/i2c/chips/tps65010.c
+++ b/drivers/i2c/chips/tps65010.c
@@ -54,7 +54,6 @@ MODULE_LICENSE("GPL");
 static unsigned short normal_i2c[] = {
 	TPS_BASE,
 	I2C_CLIENT_END };
-static unsigned short normal_i2c_range[] = { I2C_CLIENT_END };
 
 I2C_CLIENT_INSMOD;