1 files changed, 6 insertions, 7 deletions

diff --git a/drivers/net/ehea/ehea_main.c b/drivers/net/ehea/ehea_main.c
index c7a5614e66c0..519bb9f72d20 100644
--- a/drivers/net/ehea/ehea_main.c
+++ b/drivers/net/ehea/ehea_main.c
@@ -2603,14 +2603,13 @@ static int ehea_setup_ports(struct ehea_adapter *adapter)
 {
         struct device_node *lhea_dn;
         struct device_node *eth_dn = NULL;
-
-        u32 *dn_log_port_id;
+        const u32 *dn_log_port_id;
         int i = 0;
 
         lhea_dn = adapter->ebus_dev->ofdev.node;
         while ((eth_dn = of_get_next_child(lhea_dn, eth_dn))) {
 
-                dn_log_port_id = (u32*)get_property(eth_dn, "ibm,hea-port-no",
+                dn_log_port_id = get_property(eth_dn, "ibm,hea-port-no",
                                                     NULL);
                 if (!dn_log_port_id) {
                         ehea_error("bad device node: eth_dn name=%s",
@@ -2645,12 +2644,12 @@ static struct device_node *ehea_get_eth_dn(struct ehea_adapter *adapter,
 {
         struct device_node *lhea_dn;
         struct device_node *eth_dn = NULL;
-        u32 *dn_log_port_id;
+        const u32 *dn_log_port_id;
 
         lhea_dn = adapter->ebus_dev->ofdev.node;
         while ((eth_dn = of_get_next_child(lhea_dn, eth_dn))) {
 
-                dn_log_port_id = (u32*)get_property(eth_dn, "ibm,hea-port-no",
+                dn_log_port_id = get_property(eth_dn, "ibm,hea-port-no",
                                                     NULL);
                 if (dn_log_port_id)
                         if (*dn_log_port_id == logical_port_id)
@@ -2774,7 +2773,7 @@ static int __devinit ehea_probe_adapter(struct ibmebus_dev *dev,
                                         const struct of_device_id *id)
 {
         struct ehea_adapter *adapter;
-        u64 *adapter_handle;
+        const u64 *adapter_handle;
         int ret;
 
         if (!dev || !dev->ofdev.node) {
@@ -2791,7 +2790,7 @@ static int __devinit ehea_probe_adapter(struct ibmebus_dev *dev,
 
         adapter->ebus_dev = dev;
 
-        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;