MIPS: Loongson: Cleanups of serial port support

[safe/jmp/linux-2.6] / drivers / watchdog / rm9k_wdt.c

diff --git a/drivers/watchdog/rm9k_wdt.c b/drivers/watchdog/rm9k_wdt.c
index cce1982..bb66958 100644 (file)
--- a/drivers/watchdog/rm9k_wdt.c
+++ b/drivers/watchdog/rm9k_wdt.c
@@ -340,13 +340,13 @@ static const struct resource *wdt_gpi_get_resource(struct platform_device *pdv,
                                        const char *name, unsigned int type)
 {
        char buf[80];
-       if (snprintf(buf, sizeof buf, "%s_0", name) >= sizeof buf)
+       if (snprintf(buf, sizeof(buf), "%s_0", name) >= sizeof(buf))
                return NULL;
        return platform_get_resource_byname(pdv, type, buf);
 }
 
-/* No hotplugging on the platform bus - use __init */
-static int __init wdt_gpi_probe(struct platform_device *pdv)
+/* No hotplugging on the platform bus - use __devinit */
+static int __devinit wdt_gpi_probe(struct platform_device *pdv)
 {
        int res;
        const struct resource
@@ -373,7 +373,7 @@ static int __init wdt_gpi_probe(struct platform_device *pdv)
        return res;
 }
 
-static int __exit wdt_gpi_remove(struct platform_device *dev)
+static int __devexit wdt_gpi_remove(struct platform_device *dev)
 {
        int res;