lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[POWERPC] netdevices: Constify & voidify get_property()

Browse Source 
Now that get_property() returns a void *, there's no need to cast its
return value. Also, treat the return value as const, so we can
constify get_property later.

powerpc-specific network device driver changes.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
This commit is contained in:
Jeremy Kerr
2006-07-12 15:41:03 +10:00
committed by Paul Mackerras
parent 294ef16a2e
commit 1a2509c946
4 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/net/bmac.c
View File

@@ -1264,7 +1264,8 @@ static int __devinit bmac_probe(struct macio_dev *mdev, const struct of_device_i
{
int j, rev, ret;
struct bmac_data *bp;
unsigned char *addr;
const unsigned char *prop_addr;
unsigned char addr[6];
struct net_device *dev;
int is_bmac_plus = ((int)match->data) != 0;
@@ -1272,14 +1273,16 @@ static int __devinit bmac_probe(struct macio_dev *mdev, const struct of_device_i
printk(KERN_ERR "BMAC: can't use, need 3 addrs and 3 intrs\n");
return -ENODEV;
}
addr = get_property(macio_get_of_node(mdev), "mac-address", NULL);
if (addr == NULL) {
addr = get_property(macio_get_of_node(mdev), "local-mac-address", NULL);
if (addr == NULL) {
prop_addr = get_property(macio_get_of_node(mdev), "mac-address", NULL);
if (prop_addr == NULL) {
prop_addr = get_property(macio_get_of_node(mdev),
"local-mac-address", NULL);
if (prop_addr == NULL) {
printk(KERN_ERR "BMAC: Can't get mac-address\n");
return -ENODEV;
}
}
memcpy(addr, prop_addr, sizeof(addr));
dev = alloc_etherdev(PRIV_BYTES);
if (!dev) {