Skip to content

Commit

Permalink
[POWERPC] get_property returns const
Browse files Browse the repository at this point in the history
This is the last place that needs changing since get_property was changed
to return "const void *".

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
  • Loading branch information
Stephen Rothwell authored and Paul Mackerras committed May 2, 2007
1 parent a6afacb commit 9f9a3b8
Showing 1 changed file with 6 additions and 7 deletions.
13 changes: 6 additions & 7 deletions drivers/net/ehea/ehea_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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) {
Expand All @@ -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;
Expand Down

0 comments on commit 9f9a3b8

Please sign in to comment.