aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2007-04-02 20:52:17 -0400
committerPaul Mackerras <paulus@samba.org>2007-04-12 13:55:17 -0400
commita7edd0e676d51145ae634a2acf7a447e319200fa (patch)
tree24047c72a067e7c670fca186d89b1b7c032e1bde /drivers/net
parent6c2d046980299d52d78b2738ad7f11fc593dea75 (diff)
[POWERPC] get_property returns const
This just tidies up some of the remains. Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/ehea/ehea_main.c8
1 files changed, 4 insertions, 4 deletions
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,
2320 struct net_device *dev = port->netdev; 2320 struct net_device *dev = port->netdev;
2321 struct ehea_adapter *adapter = port->adapter; 2321 struct ehea_adapter *adapter = port->adapter;
2322 struct hcp_ehea_port_cb4 *cb4; 2322 struct hcp_ehea_port_cb4 *cb4;
2323 u32 *dn_log_port_id; 2323 const u32 *dn_log_port_id;
2324 int jumbo = 0; 2324 int jumbo = 0;
2325 2325
2326 sema_init(&port->port_lock, 1); 2326 sema_init(&port->port_lock, 1);
@@ -2336,7 +2336,7 @@ static int ehea_setup_single_port(struct ehea_port *port,
2336 port->of_dev_node = dn; 2336 port->of_dev_node = dn;
2337 2337
2338 /* Determine logical port id */ 2338 /* Determine logical port id */
2339 dn_log_port_id = (u32*)get_property(dn, "ibm,hea-port-no", NULL); 2339 dn_log_port_id = get_property(dn, "ibm,hea-port-no", NULL);
2340 2340
2341 if (!dn_log_port_id) { 2341 if (!dn_log_port_id) {
2342 ehea_error("bad device node: dn_log_port_id=%p", 2342 ehea_error("bad device node: dn_log_port_id=%p",
@@ -2492,7 +2492,7 @@ static int __devinit ehea_probe(struct ibmebus_dev *dev,
2492 const struct of_device_id *id) 2492 const struct of_device_id *id)
2493{ 2493{
2494 struct ehea_adapter *adapter; 2494 struct ehea_adapter *adapter;
2495 u64 *adapter_handle; 2495 const u64 *adapter_handle;
2496 int ret; 2496 int ret;
2497 2497
2498 adapter = kzalloc(sizeof(*adapter), GFP_KERNEL); 2498 adapter = kzalloc(sizeof(*adapter), GFP_KERNEL);
@@ -2502,7 +2502,7 @@ static int __devinit ehea_probe(struct ibmebus_dev *dev,
2502 goto out; 2502 goto out;
2503 } 2503 }
2504 2504
2505 adapter_handle = (u64*)get_property(dev->ofdev.node, "ibm,hea-handle", 2505 adapter_handle = get_property(dev->ofdev.node, "ibm,hea-handle",
2506 NULL); 2506 NULL);
2507 if (adapter_handle) 2507 if (adapter_handle)
2508 adapter->handle = *adapter_handle; 2508 adapter->handle = *adapter_handle;