Merge branch 'linux-2.6'

[sfrench/cifs-2.6.git] / arch / powerpc / sysdev / mmio_nvram.c

diff --git a/arch/powerpc/sysdev/mmio_nvram.c b/arch/powerpc/sysdev/mmio_nvram.c
index 74e0d31a3559cf9ca3859a0f3b55fff962966f97..ff23f5a4d4b91887e3de34060b62e86dc3a9b158 100644 (file)
--- a/arch/powerpc/sysdev/mmio_nvram.c
+++ b/arch/powerpc/sysdev/mmio_nvram.c
@@ -32,7 +32,7 @@
 
 static void __iomem *mmio_nvram_start;
 static long mmio_nvram_len;
-static spinlock_t mmio_nvram_lock = SPIN_LOCK_UNLOCKED;
+static DEFINE_SPINLOCK(mmio_nvram_lock);
 
 static ssize_t mmio_nvram_read(char *buf, size_t count, loff_t *index)
 {
@@ -80,7 +80,7 @@ static ssize_t mmio_nvram_get_size(void)
 int __init mmio_nvram_init(void)
 {
        struct device_node *nvram_node;
-       unsigned long *buffer;
+       const unsigned long *buffer;
        int proplen;
        unsigned long nvram_addr;
        int ret;
@@ -91,7 +91,7 @@ int __init mmio_nvram_init(void)
                goto out;
 
        ret = -EIO;
-       buffer = (unsigned long *)get_property(nvram_node, "reg", &proplen);
+       buffer = get_property(nvram_node, "reg", &proplen);
        if (proplen != 2*sizeof(unsigned long))
                goto out;