1 files changed, 9 insertions, 10 deletions

diff --git a/drivers/macintosh/smu.c b/drivers/macintosh/smu.c
index f139a74696fe..6f358600536e 100644
--- a/drivers/macintosh/smu.c
+++ b/drivers/macintosh/smu.c
@@ -447,7 +447,7 @@ EXPORT_SYMBOL(smu_present);
 int __init smu_init (void)
 {
         struct device_node *np;
-        u32 *data;
+        const u32 *data;
 
         np = of_find_node_by_type(NULL, "smu");
         if (np == NULL)
@@ -483,7 +483,7 @@ int __init smu_init (void)
                 printk(KERN_ERR "SMU: Can't find doorbell GPIO !\n");
                 goto fail;
         }
-        data = (u32 *)get_property(np, "reg", NULL);
+        data = get_property(np, "reg", NULL);
         if (data == NULL) {
                 of_node_put(np);
                 printk(KERN_ERR "SMU: Can't find doorbell GPIO address !\n");
@@ -506,7 +506,7 @@ int __init smu_init (void)
                 np = of_find_node_by_name(NULL, "smu-interrupt");
                 if (np == NULL)
                         break;
-                data = (u32 *)get_property(np, "reg", NULL);
+                data = get_property(np, "reg", NULL);
                 if (data == NULL) {
                         of_node_put(np);
                         break;
@@ -959,11 +959,11 @@ static struct smu_sdbp_header *smu_create_sdb_partition(int id)
 /* Note: Only allowed to return error code in pointers (using ERR_PTR)
  * when interruptible is 1
  */
-struct smu_sdbp_header *__smu_get_sdb_partition(int id, unsigned int *size,
-                                                int interruptible)
+const struct smu_sdbp_header *__smu_get_sdb_partition(int id,
+                unsigned int *size, int interruptible)
 {
         char pname[32];
-        struct smu_sdbp_header *part;
+        const struct smu_sdbp_header *part;
 
         if (!smu)
                 return NULL;
@@ -980,8 +980,7 @@ struct smu_sdbp_header *__smu_get_sdb_partition(int id, unsigned int *size,
         } else
                 mutex_lock(&smu_part_access);
 
-        part = (struct smu_sdbp_header *)get_property(smu->of_node,
-                                                      pname, size);
+        part = get_property(smu->of_node, pname, size);
         if (part == NULL) {
                 DPRINTK("trying to extract from SMU ...\n");
                 part = smu_create_sdb_partition(id);
@@ -992,7 +991,7 @@ struct smu_sdbp_header *__smu_get_sdb_partition(int id, unsigned int *size,
         return part;
 }
 
-struct smu_sdbp_header *smu_get_sdb_partition(int id, unsigned int *size)
+const struct smu_sdbp_header *smu_get_sdb_partition(int id, unsigned int *size)
 {
         return __smu_get_sdb_partition(id, size, 0);
 }
@@ -1071,7 +1070,7 @@ static ssize_t smu_write(struct file *file, const char __user *buf,
                 pp->mode = smu_file_events;
                 return 0;
         } else if (hdr.cmdtype == SMU_CMDTYPE_GET_PARTITION) {
-                struct smu_sdbp_header *part;
+                const struct smu_sdbp_header *part;
                 part = __smu_get_sdb_partition(hdr.cmd, NULL, 1);
                 if (part == NULL)
                         return -EINVAL;