summaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2007-03-29 00:49:54 -0700
committerDavid S. Miller <davem@sunset.davemloft.net>2007-04-26 01:54:27 -0700
commitccf0dec6fcadb4e1c877b9bafb031a6bdb7112b9 (patch)
tree98617d025f167ad05bb126f0982841ce277ee3af /drivers/net
parent6a23acf3905287eb952a6f1dbbc8fb3e4eeae2f6 (diff)
downloadop-kernel-dev-ccf0dec6fcadb4e1c877b9bafb031a6bdb7112b9.zip
op-kernel-dev-ccf0dec6fcadb4e1c877b9bafb031a6bdb7112b9.tar.gz
[SPARC/64] constify of_get_property return: drivers
The only unfortunate bit here is that the name field of struct map_info is not const, so for now we put a cast on the assignment of it. Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/sungem.c2
-rw-r--r--drivers/net/sunhme.c6
-rw-r--r--drivers/net/tg3.c2
-rw-r--r--drivers/net/tulip/tulip_core.c2
4 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/sungem.c b/drivers/net/sungem.c
index 08ea61d..bb07b79 100644
--- a/drivers/net/sungem.c
+++ b/drivers/net/sungem.c
@@ -2914,7 +2914,7 @@ static int __devinit gem_get_device_address(struct gem *gp)
int use_idprom = 1;
if (pcp != NULL) {
- unsigned char *addr;
+ const unsigned char *addr;
int len;
addr = of_get_property(pcp->prom_node, "local-mac-address",
diff --git a/drivers/net/sunhme.c b/drivers/net/sunhme.c
index 192bbc9..bee5e5b 100644
--- a/drivers/net/sunhme.c
+++ b/drivers/net/sunhme.c
@@ -2704,7 +2704,7 @@ static int __devinit happy_meal_sbus_probe_one(struct sbus_dev *sdev, int is_qfe
dev->dev_addr[i] = macaddr[i];
macaddr[5]++;
} else {
- unsigned char *addr;
+ const unsigned char *addr;
int len;
addr = of_get_property(dp, "local-mac-address", &len);
@@ -3081,7 +3081,7 @@ static int __devinit happy_meal_pci_probe(struct pci_dev *pdev,
macaddr[5]++;
} else {
#ifdef CONFIG_SPARC
- unsigned char *addr;
+ const unsigned char *addr;
int len;
if (qfe_slot != -1 &&
@@ -3300,7 +3300,7 @@ static int __devinit hme_sbus_probe(struct of_device *dev, const struct of_devic
{
struct sbus_dev *sdev = to_sbus_device(&dev->dev);
struct device_node *dp = dev->node;
- char *model = of_get_property(dp, "model", NULL);
+ const char *model = of_get_property(dp, "model", NULL);
int is_qfe = (match->data != NULL);
if (!is_qfe && model && !strcmp(model, "SUNW,sbus-qfe"))
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
index 256969e..45b4e01 100644
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
@@ -10996,7 +10996,7 @@ static int __devinit tg3_get_macaddr_sparc(struct tg3 *tp)
struct pcidev_cookie *pcp = pdev->sysdata;
if (pcp != NULL) {
- unsigned char *addr;
+ const unsigned char *addr;
int len;
addr = of_get_property(pcp->prom_node, "local-mac-address",
diff --git a/drivers/net/tulip/tulip_core.c b/drivers/net/tulip/tulip_core.c
index e3774a5..03c1418 100644
--- a/drivers/net/tulip/tulip_core.c
+++ b/drivers/net/tulip/tulip_core.c
@@ -1544,7 +1544,7 @@ static int __devinit tulip_init_one (struct pci_dev *pdev,
dev->dev_addr[i] = last_phys_addr[i] + 1;
#if defined(__sparc__)
if (pcp) {
- unsigned char *addr;
+ const unsigned char *addr;
int len;
addr = of_get_property(pcp->prom_node,
OpenPOWER on IntegriCloud