From f196e9e7b7547361b46b6da6a84883dd84f62f34 Mon Sep 17 00:00:00 2001 From: Stephen Rothwell Date: Tue, 1 May 2007 13:51:32 +1000 Subject: [PATCH] --- yaml --- r: 55011 b: refs/heads/master c: 9f9a3b8a06b7965335bfe5162c1a50e4d9c3859b h: refs/heads/master i: 55009: 99258648d1c649ce42f16c29c740ce296520c234 55007: 0fd4029db6fce30c292b1cee7f3f4a45afd933c6 v: v3 --- [refs] | 2 +- trunk/drivers/net/ehea/ehea_main.c | 13 ++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index ab11855891e7..8ae498f8b780 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a6afacb6b8ba3d2eed6406a018e604d6f9c0f97d +refs/heads/master: 9f9a3b8a06b7965335bfe5162c1a50e4d9c3859b diff --git a/trunk/drivers/net/ehea/ehea_main.c b/trunk/drivers/net/ehea/ehea_main.c index c7a5614e66c0..519bb9f72d20 100644 --- a/trunk/drivers/net/ehea/ehea_main.c +++ b/trunk/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;