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
of: Always use 'struct device.of_node' to get device node pointer.
[pandora-kernel.git]
/
arch
/
sparc
/
kernel
/
chmc.c
diff --git
a/arch/sparc/kernel/chmc.c
b/arch/sparc/kernel/chmc.c
index
e1a9598
..
9368796
100644
(file)
--- a/
arch/sparc/kernel/chmc.c
+++ b/
arch/sparc/kernel/chmc.c
@@
-425,7
+425,7
@@
static int __devinit jbusmc_probe(struct of_device *op,
INIT_LIST_HEAD(&p->list);
err = -ENODEV;
INIT_LIST_HEAD(&p->list);
err = -ENODEV;
- prop = of_get_property(op->node, "portid", &len);
+ prop = of_get_property(op->
dev.of_
node, "portid", &len);
if (!prop || len != 4) {
printk(KERN_ERR PFX "Cannot find portid.\n");
goto out_free;
if (!prop || len != 4) {
printk(KERN_ERR PFX "Cannot find portid.\n");
goto out_free;
@@
-433,7
+433,7
@@
static int __devinit jbusmc_probe(struct of_device *op,
p->portid = *prop;
p->portid = *prop;
- prop = of_get_property(op->node, "memory-control-register-1", &len);
+ prop = of_get_property(op->
dev.of_
node, "memory-control-register-1", &len);
if (!prop || len != 8) {
printk(KERN_ERR PFX "Cannot get memory control register 1.\n");
goto out_free;
if (!prop || len != 8) {
printk(KERN_ERR PFX "Cannot get memory control register 1.\n");
goto out_free;
@@
-449,7
+449,7
@@
static int __devinit jbusmc_probe(struct of_device *op,
}
err = -ENODEV;
}
err = -ENODEV;
- ml = of_get_property(op->node, "memory-layout", &p->layout_len);
+ ml = of_get_property(op->
dev.of_
node, "memory-layout", &p->layout_len);
if (!ml) {
printk(KERN_ERR PFX "Cannot get memory layout property.\n");
goto out_iounmap;
if (!ml) {
printk(KERN_ERR PFX "Cannot get memory layout property.\n");
goto out_iounmap;
@@
-466,7
+466,7
@@
static int __devinit jbusmc_probe(struct of_device *op,
mc_list_add(&p->list);
printk(KERN_INFO PFX "UltraSPARC-IIIi memory controller at %s\n",
mc_list_add(&p->list);
printk(KERN_INFO PFX "UltraSPARC-IIIi memory controller at %s\n",
- op->node->full_name);
+ op->
dev.of_
node->full_name);
dev_set_drvdata(&op->dev, p);
dev_set_drvdata(&op->dev, p);
@@
-693,7
+693,7
@@
static void chmc_fetch_decode_regs(struct chmc *p)
static int __devinit chmc_probe(struct of_device *op,
const struct of_device_id *match)
{
static int __devinit chmc_probe(struct of_device *op,
const struct of_device_id *match)
{
- struct device_node *dp = op->node;
+ struct device_node *dp = op->
dev.of_
node;
unsigned long ver;
const void *pval;
int len, portid;
unsigned long ver;
const void *pval;
int len, portid;