diff options
Diffstat (limited to 'drivers/macintosh/macio_asic.c')
-rw-r--r-- | drivers/macintosh/macio_asic.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/macintosh/macio_asic.c b/drivers/macintosh/macio_asic.c index 82657bc86d19..d56216067549 100644 --- a/drivers/macintosh/macio_asic.c +++ b/drivers/macintosh/macio_asic.c | |||
@@ -139,7 +139,9 @@ static int macio_uevent(struct device *dev, char **envp, int num_envp, | |||
139 | { | 139 | { |
140 | struct macio_dev * macio_dev; | 140 | struct macio_dev * macio_dev; |
141 | struct of_device * of; | 141 | struct of_device * of; |
142 | char *scratch, *compat, *compat2; | 142 | char *scratch; |
143 | const char *compat, *compat2; | ||
144 | |||
143 | int i = 0; | 145 | int i = 0; |
144 | int length, cplen, cplen2, seen = 0; | 146 | int length, cplen, cplen2, seen = 0; |
145 | 147 | ||
@@ -173,7 +175,7 @@ static int macio_uevent(struct device *dev, char **envp, int num_envp, | |||
173 | * it's not really legal to split it out with commas. We split it | 175 | * it's not really legal to split it out with commas. We split it |
174 | * up using a number of environment variables instead. */ | 176 | * up using a number of environment variables instead. */ |
175 | 177 | ||
176 | compat = (char *) get_property(of->node, "compatible", &cplen); | 178 | compat = get_property(of->node, "compatible", &cplen); |
177 | compat2 = compat; | 179 | compat2 = compat; |
178 | cplen2= cplen; | 180 | cplen2= cplen; |
179 | while (compat && cplen > 0) { | 181 | while (compat && cplen > 0) { |
@@ -454,7 +456,7 @@ static struct macio_dev * macio_add_one_device(struct macio_chip *chip, | |||
454 | struct resource *parent_res) | 456 | struct resource *parent_res) |
455 | { | 457 | { |
456 | struct macio_dev *dev; | 458 | struct macio_dev *dev; |
457 | u32 *reg; | 459 | const u32 *reg; |
458 | 460 | ||
459 | if (np == NULL) | 461 | if (np == NULL) |
460 | return NULL; | 462 | return NULL; |
@@ -489,7 +491,7 @@ static struct macio_dev * macio_add_one_device(struct macio_chip *chip, | |||
489 | #endif | 491 | #endif |
490 | MAX_NODE_NAME_SIZE, np->name); | 492 | MAX_NODE_NAME_SIZE, np->name); |
491 | } else { | 493 | } else { |
492 | reg = (u32 *)get_property(np, "reg", NULL); | 494 | reg = get_property(np, "reg", NULL); |
493 | sprintf(dev->ofdev.dev.bus_id, "%1d.%08x:%.*s", | 495 | sprintf(dev->ofdev.dev.bus_id, "%1d.%08x:%.*s", |
494 | chip->lbus.index, | 496 | chip->lbus.index, |
495 | reg ? *reg : 0, MAX_NODE_NAME_SIZE, np->name); | 497 | reg ? *reg : 0, MAX_NODE_NAME_SIZE, np->name); |