7 files changed, 15 insertions, 15 deletions

diff --git a/drivers/hwmon/ams/ams-core.c b/drivers/hwmon/ams/ams-core.c
index f1f0f5d0442c..f5ebad561412 100644
--- a/drivers/hwmon/ams/ams-core.c
+++ b/drivers/hwmon/ams/ams-core.c
@@ -141,10 +141,10 @@ static void ams_worker(struct work_struct *work)
 int ams_sensor_attach(void)
 {
         int result;
-        u32 *prop;
+        const u32 *prop;
 
         /* Get orientation */
-        prop = (u32*)get_property(ams_info.of_node, "orientation", NULL);
+        prop = get_property(ams_info.of_node, "orientation", NULL);
         if (!prop)
                 return -ENODEV;
         ams_info.orient1 = *prop;
diff --git a/drivers/hwmon/ams/ams-i2c.c b/drivers/hwmon/ams/ams-i2c.c
index 0d24bdfea53e..485d333bcb3e 100644
--- a/drivers/hwmon/ams/ams-i2c.c
+++ b/drivers/hwmon/ams/ams-i2c.c
@@ -263,7 +263,7 @@ int __init ams_i2c_init(struct device_node *np)
 {
         char *tmp_bus;
         int result;
-        u32 *prop;
+        const u32 *prop;
 
         mutex_lock(&ams_info.lock);
 
@@ -276,7 +276,7 @@ int __init ams_i2c_init(struct device_node *np)
         ams_info.bustype = BUS_I2C;
 
         /* look for bus either using "reg" or by path */
-        prop = (u32*)get_property(ams_info.of_node, "reg", NULL);
+        prop = get_property(ams_info.of_node, "reg", NULL);
         if (!prop) {
                 result = -ENODEV;
 
diff --git a/drivers/hwmon/ams/ams-pmu.c b/drivers/hwmon/ams/ams-pmu.c
index 4636ae031a53..1b01c215bfe7 100644
--- a/drivers/hwmon/ams/ams-pmu.c
+++ b/drivers/hwmon/ams/ams-pmu.c
@@ -146,7 +146,7 @@ static void ams_pmu_exit(void)
 
 int __init ams_pmu_init(struct device_node *np)
 {
-        u32 *prop;
+        const u32 *prop;
         int result;
 
         mutex_lock(&ams_info.lock);
@@ -160,7 +160,7 @@ int __init ams_pmu_init(struct device_node *np)
         ams_info.bustype = BUS_HOST;
 
         /* Get PMU command, should be 0x4e, but we can never know */
-        prop = (u32*)get_property(ams_info.of_node, "reg", NULL);
+        prop = get_property(ams_info.of_node, "reg", NULL);
         if (!prop) {
                 result = -ENODEV;
                 goto exit;
diff --git a/drivers/infiniband/hw/ehca/ehca_main.c b/drivers/infiniband/hw/ehca/ehca_main.c
index 059da9628bb5..cee66b79b30d 100644
--- a/drivers/infiniband/hw/ehca/ehca_main.c
+++ b/drivers/infiniband/hw/ehca/ehca_main.c
@@ -565,11 +565,11 @@ static int __devinit ehca_probe(struct ibmebus_dev *dev,
                                 const struct of_device_id *id)
 {
         struct ehca_shca *shca;
-        u64 *handle;
+        const u64 *handle;
         struct ib_pd *ibpd;
         int ret;
 
-        handle = (u64 *)get_property(dev->ofdev.node, "ibm,hca-handle", NULL);
+        handle = get_property(dev->ofdev.node, "ibm,hca-handle", NULL);
         if (!handle) {
                 ehca_gen_err("Cannot get eHCA handle for adapter: %s.",
                              dev->ofdev.node->full_name);
diff --git a/drivers/net/ehea/ehea_main.c b/drivers/net/ehea/ehea_main.c
index 0e4042bc0a48..d1a8134c8e31 100644
--- a/drivers/net/ehea/ehea_main.c
+++ b/drivers/net/ehea/ehea_main.c
@@ -2320,7 +2320,7 @@ static int ehea_setup_single_port(struct ehea_port *port,
         struct net_device *dev = port->netdev;
         struct ehea_adapter *adapter = port->adapter;
         struct hcp_ehea_port_cb4 *cb4;
-        u32 *dn_log_port_id;
+        const u32 *dn_log_port_id;
         int jumbo = 0;
 
         sema_init(&port->port_lock, 1);
@@ -2336,7 +2336,7 @@ static int ehea_setup_single_port(struct ehea_port *port,
         port->of_dev_node = dn;
 
         /* Determine logical port id */
-        dn_log_port_id = (u32*)get_property(dn, "ibm,hea-port-no", NULL);
+        dn_log_port_id = get_property(dn, "ibm,hea-port-no", NULL);
 
         if (!dn_log_port_id) {
                 ehea_error("bad device node: dn_log_port_id=%p",
@@ -2492,7 +2492,7 @@ static int __devinit ehea_probe(struct ibmebus_dev *dev,
                                 const struct of_device_id *id)
 {
         struct ehea_adapter *adapter;
-        u64 *adapter_handle;
+        const u64 *adapter_handle;
         int ret;
 
         adapter = kzalloc(sizeof(*adapter), GFP_KERNEL);
@@ -2502,7 +2502,7 @@ static int __devinit ehea_probe(struct ibmebus_dev *dev,
                 goto out;
         }
 
-        adapter_handle = (u64*)get_property(dev->ofdev.node, "ibm,hea-handle",
+        adapter_handle = get_property(dev->ofdev.node, "ibm,hea-handle",
                                             NULL);
         if (adapter_handle)
                 adapter->handle = *adapter_handle;
diff --git a/drivers/scsi/ibmvscsi/ibmvstgt.c b/drivers/scsi/ibmvscsi/ibmvstgt.c
index 4368ca0e8270..f65f21da3fd8 100644
--- a/drivers/scsi/ibmvscsi/ibmvstgt.c
+++ b/drivers/scsi/ibmvscsi/ibmvstgt.c
@@ -897,7 +897,7 @@ static int get_system_info(void)
 {
         struct device_node *rootdn;
         const char *id, *model, *name;
-        unsigned int *num;
+        const unsigned int *num;
 
         rootdn = find_path_device("/");
         if (!rootdn)
@@ -912,7 +912,7 @@ static int get_system_info(void)
         if (name)
                 strncpy(partition_name, name, sizeof(partition_name));
 
-        num = (unsigned int *) get_property(rootdn, "ibm,partition-no", NULL);
+        num = get_property(rootdn, "ibm,partition-no", NULL);
         if (num)
                 partition_number = *num;
 
diff --git a/drivers/video/aty/radeon_pm.c b/drivers/video/aty/radeon_pm.c
index 9a2b0d69b0ae..c411293cefc8 100644
--- a/drivers/video/aty/radeon_pm.c
+++ b/drivers/video/aty/radeon_pm.c
@@ -1262,7 +1262,7 @@ static void radeon_pm_full_reset_sdram(struct radeonfb_info *rinfo)
         /* This is the code for the Aluminium PowerBooks M10 / iBooks M11 */
         if (rinfo->family == CHIP_FAMILY_RV350) {
                 u32 sdram_mode_reg = rinfo->save_regs[35];
-                static u32 default_mrtable[] =
+                static const u32 default_mrtable[] =
                         { 0x21320032,
                           0x21321000, 0xa1321000, 0x21321000, 0xffffffff,
                           0x21320032, 0xa1320032, 0x21320032, 0xffffffff,