git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq
[pandora-kernel.git]
/
drivers
/
macintosh
/
macio_asic.c
diff --git
a/drivers/macintosh/macio_asic.c
b/drivers/macintosh/macio_asic.c
index
80c0c66
..
d562160
100644
(file)
--- 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,
{
struct macio_dev * macio_dev;
struct of_device * of;
{
struct macio_dev * macio_dev;
struct of_device * of;
- char *scratch, *compat, *compat2;
+ char *scratch;
+ const char *compat, *compat2;
+
int i = 0;
int length, cplen, cplen2, seen = 0;
int i = 0;
int length, cplen, cplen2, seen = 0;
@@
-173,7
+175,7
@@
static int macio_uevent(struct device *dev, char **envp, int num_envp,
* it's not really legal to split it out with commas. We split it
* up using a number of environment variables instead. */
* it's not really legal to split it out with commas. We split it
* up using a number of environment variables instead. */
- compat =
(char *)
get_property(of->node, "compatible", &cplen);
+ compat = get_property(of->node, "compatible", &cplen);
compat2 = compat;
cplen2= cplen;
while (compat && cplen > 0) {
compat2 = compat;
cplen2= cplen;
while (compat && cplen > 0) {
@@
-330,7
+332,7
@@
static void macio_create_fixup_irq(struct macio_dev *dev, int index,
{
unsigned int irq;
{
unsigned int irq;
- irq = irq_create_mapping(NULL, line
, 0
);
+ irq = irq_create_mapping(NULL, line);
if (irq != NO_IRQ) {
dev->interrupt[index].start = irq;
dev->interrupt[index].flags = IORESOURCE_IRQ;
if (irq != NO_IRQ) {
dev->interrupt[index].start = irq;
dev->interrupt[index].flags = IORESOURCE_IRQ;
@@
-454,7
+456,7
@@
static struct macio_dev * macio_add_one_device(struct macio_chip *chip,
struct resource *parent_res)
{
struct macio_dev *dev;
struct resource *parent_res)
{
struct macio_dev *dev;
- u32 *reg;
+
const
u32 *reg;
if (np == NULL)
return NULL;
if (np == NULL)
return NULL;
@@
-489,7
+491,7
@@
static struct macio_dev * macio_add_one_device(struct macio_chip *chip,
#endif
MAX_NODE_NAME_SIZE, np->name);
} else {
#endif
MAX_NODE_NAME_SIZE, np->name);
} else {
- reg =
(u32 *)
get_property(np, "reg", NULL);
+ reg = get_property(np, "reg", NULL);
sprintf(dev->ofdev.dev.bus_id, "%1d.%08x:%.*s",
chip->lbus.index,
reg ? *reg : 0, MAX_NODE_NAME_SIZE, np->name);
sprintf(dev->ofdev.dev.bus_id, "%1d.%08x:%.*s",
chip->lbus.index,
reg ? *reg : 0, MAX_NODE_NAME_SIZE, np->name);