projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'writable_limits' of git://decibel.fi.muni.cz/~xslaby/linux
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
edac
/
ppc4xx_edac.c
diff --git
a/drivers/edac/ppc4xx_edac.c
b/drivers/edac/ppc4xx_edac.c
index 9d6f6783328c80357cb794614ff79dca1e0b84d0..e78839e89a067400726b26a302eb05f317200b02 100644
(file)
--- a/
drivers/edac/ppc4xx_edac.c
+++ b/
drivers/edac/ppc4xx_edac.c
@@
-1022,7
+1022,7
@@
ppc4xx_edac_mc_init(struct mem_ctl_info *mci,
int status = 0;
const u32 memcheck = (mcopt1 & SDRAM_MCOPT1_MCHK_MASK);
struct ppc4xx_edac_pdata *pdata = NULL;
int status = 0;
const u32 memcheck = (mcopt1 & SDRAM_MCOPT1_MCHK_MASK);
struct ppc4xx_edac_pdata *pdata = NULL;
- const struct device_node *np = op->node;
+ const struct device_node *np = op->
dev.of_
node;
if (match == NULL)
return -EINVAL;
if (match == NULL)
return -EINVAL;
@@
-1113,7
+1113,7
@@
ppc4xx_edac_register_irq(struct of_device *op, struct mem_ctl_info *mci)
int status = 0;
int ded_irq, sec_irq;
struct ppc4xx_edac_pdata *pdata = mci->pvt_info;
int status = 0;
int ded_irq, sec_irq;
struct ppc4xx_edac_pdata *pdata = mci->pvt_info;
- struct device_node *np = op->node;
+ struct device_node *np = op->
dev.of_
node;
ded_irq = irq_of_parse_and_map(np, INTMAP_ECCDED_INDEX);
sec_irq = irq_of_parse_and_map(np, INTMAP_ECCSEC_INDEX);
ded_irq = irq_of_parse_and_map(np, INTMAP_ECCDED_INDEX);
sec_irq = irq_of_parse_and_map(np, INTMAP_ECCSEC_INDEX);
@@
-1243,7
+1243,7
@@
ppc4xx_edac_probe(struct of_device *op, const struct of_device_id *match)
int status = 0;
u32 mcopt1, memcheck;
dcr_host_t dcr_host;
int status = 0;
u32 mcopt1, memcheck;
dcr_host_t dcr_host;
- const struct device_node *np = op->node;
+ const struct device_node *np = op->
dev.of_
node;
struct mem_ctl_info *mci = NULL;
static int ppc4xx_edac_instance;
struct mem_ctl_info *mci = NULL;
static int ppc4xx_edac_instance;