diff options
author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-03-16 06:44:18 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-06-11 10:56:06 -0400 |
commit | fd687502dc8037aa5a4b84c570ada971106574ee (patch) | |
tree | 53e7c4141571ff349759614095c12e853492f068 /drivers/edac/cell_edac.c | |
parent | 53f2d02898755d1b24bde1975e202815d29fdb81 (diff) |
edac: Rename the parent dev to pdev
As EDAC doesn't use struct device itself, it created a parent dev
pointer called as "pdev". Now that we'll be converting it to use
struct device, instead of struct devsys, this needs to be fixed.
No functional changes.
Reviewed-by: Aristeu Rozanski <arozansk@redhat.com>
Acked-by: Chris Metcalf <cmetcalf@tilera.com>
Cc: Doug Thompson <norsk5@yahoo.com>
Cc: Borislav Petkov <borislav.petkov@amd.com>
Cc: Mark Gross <mark.gross@intel.com>
Cc: Jason Uhlenkott <juhlenko@akamai.com>
Cc: Tim Small <tim@buttersideup.com>
Cc: Ranganathan Desikan <ravi@jetztechnologies.com>
Cc: "Arvind R." <arvino55@gmail.com>
Cc: Olof Johansson <olof@lixom.net>
Cc: Egor Martovetsky <egor@pasemi.com>
Cc: Michal Marek <mmarek@suse.cz>
Cc: Jiri Kosina <jkosina@suse.cz>
Cc: Joe Perches <joe@perches.com>
Cc: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Hitoshi Mitake <h.mitake@gmail.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: "Niklas Söderlund" <niklas.soderlund@ericsson.com>
Cc: Shaohui Xie <Shaohui.Xie@freescale.com>
Cc: Josh Boyer <jwboyer@gmail.com>
Cc: linuxppc-dev@lists.ozlabs.org
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/edac/cell_edac.c')
-rw-r--r-- | drivers/edac/cell_edac.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/edac/cell_edac.c b/drivers/edac/cell_edac.c index 69ee6aab5c71..2e5b95374dc6 100644 --- a/drivers/edac/cell_edac.c +++ b/drivers/edac/cell_edac.c | |||
@@ -36,7 +36,7 @@ static void cell_edac_count_ce(struct mem_ctl_info *mci, int chan, u64 ar) | |||
36 | struct csrow_info *csrow = &mci->csrows[0]; | 36 | struct csrow_info *csrow = &mci->csrows[0]; |
37 | unsigned long address, pfn, offset, syndrome; | 37 | unsigned long address, pfn, offset, syndrome; |
38 | 38 | ||
39 | dev_dbg(mci->dev, "ECC CE err on node %d, channel %d, ar = 0x%016llx\n", | 39 | dev_dbg(mci->pdev, "ECC CE err on node %d, channel %d, ar = 0x%016llx\n", |
40 | priv->node, chan, ar); | 40 | priv->node, chan, ar); |
41 | 41 | ||
42 | /* Address decoding is likely a bit bogus, to dbl check */ | 42 | /* Address decoding is likely a bit bogus, to dbl check */ |
@@ -59,7 +59,7 @@ static void cell_edac_count_ue(struct mem_ctl_info *mci, int chan, u64 ar) | |||
59 | struct csrow_info *csrow = &mci->csrows[0]; | 59 | struct csrow_info *csrow = &mci->csrows[0]; |
60 | unsigned long address, pfn, offset; | 60 | unsigned long address, pfn, offset; |
61 | 61 | ||
62 | dev_dbg(mci->dev, "ECC UE err on node %d, channel %d, ar = 0x%016llx\n", | 62 | dev_dbg(mci->pdev, "ECC UE err on node %d, channel %d, ar = 0x%016llx\n", |
63 | priv->node, chan, ar); | 63 | priv->node, chan, ar); |
64 | 64 | ||
65 | /* Address decoding is likely a bit bogus, to dbl check */ | 65 | /* Address decoding is likely a bit bogus, to dbl check */ |
@@ -83,7 +83,7 @@ static void cell_edac_check(struct mem_ctl_info *mci) | |||
83 | fir = in_be64(&priv->regs->mic_fir); | 83 | fir = in_be64(&priv->regs->mic_fir); |
84 | #ifdef DEBUG | 84 | #ifdef DEBUG |
85 | if (fir != priv->prev_fir) { | 85 | if (fir != priv->prev_fir) { |
86 | dev_dbg(mci->dev, "fir change : 0x%016lx\n", fir); | 86 | dev_dbg(mci->pdev, "fir change : 0x%016lx\n", fir); |
87 | priv->prev_fir = fir; | 87 | priv->prev_fir = fir; |
88 | } | 88 | } |
89 | #endif | 89 | #endif |
@@ -119,7 +119,7 @@ static void cell_edac_check(struct mem_ctl_info *mci) | |||
119 | mb(); /* sync up */ | 119 | mb(); /* sync up */ |
120 | #ifdef DEBUG | 120 | #ifdef DEBUG |
121 | fir = in_be64(&priv->regs->mic_fir); | 121 | fir = in_be64(&priv->regs->mic_fir); |
122 | dev_dbg(mci->dev, "fir clear : 0x%016lx\n", fir); | 122 | dev_dbg(mci->pdev, "fir clear : 0x%016lx\n", fir); |
123 | #endif | 123 | #endif |
124 | } | 124 | } |
125 | } | 125 | } |
@@ -155,7 +155,7 @@ static void __devinit cell_edac_init_csrows(struct mem_ctl_info *mci) | |||
155 | dimm->edac_mode = EDAC_SECDED; | 155 | dimm->edac_mode = EDAC_SECDED; |
156 | dimm->nr_pages = nr_pages / csrow->nr_channels; | 156 | dimm->nr_pages = nr_pages / csrow->nr_channels; |
157 | } | 157 | } |
158 | dev_dbg(mci->dev, | 158 | dev_dbg(mci->pdev, |
159 | "Initialized on node %d, chanmask=0x%x," | 159 | "Initialized on node %d, chanmask=0x%x," |
160 | " first_page=0x%lx, nr_pages=0x%x\n", | 160 | " first_page=0x%lx, nr_pages=0x%x\n", |
161 | priv->node, priv->chanmask, | 161 | priv->node, priv->chanmask, |
@@ -212,7 +212,7 @@ static int __devinit cell_edac_probe(struct platform_device *pdev) | |||
212 | priv->regs = regs; | 212 | priv->regs = regs; |
213 | priv->node = pdev->id; | 213 | priv->node = pdev->id; |
214 | priv->chanmask = chanmask; | 214 | priv->chanmask = chanmask; |
215 | mci->dev = &pdev->dev; | 215 | mci->pdev = &pdev->dev; |
216 | mci->mtype_cap = MEM_FLAG_XDR; | 216 | mci->mtype_cap = MEM_FLAG_XDR; |
217 | mci->edac_ctl_cap = EDAC_FLAG_NONE | EDAC_FLAG_EC | EDAC_FLAG_SECDED; | 217 | mci->edac_ctl_cap = EDAC_FLAG_NONE | EDAC_FLAG_EC | EDAC_FLAG_SECDED; |
218 | mci->edac_cap = EDAC_FLAG_EC | EDAC_FLAG_SECDED; | 218 | mci->edac_cap = EDAC_FLAG_EC | EDAC_FLAG_SECDED; |