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/edac_mc.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/edac_mc.c')
-rw-r--r-- | drivers/edac/edac_mc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/edac/edac_mc.c b/drivers/edac/edac_mc.c index ce25750a83f9..811f09a38f3a 100644 --- a/drivers/edac/edac_mc.c +++ b/drivers/edac/edac_mc.c | |||
@@ -93,7 +93,7 @@ static void edac_mc_dump_mci(struct mem_ctl_info *mci) | |||
93 | mci->nr_csrows, mci->csrows); | 93 | mci->nr_csrows, mci->csrows); |
94 | debugf3("\tmci->nr_dimms = %d, dimms = %p\n", | 94 | debugf3("\tmci->nr_dimms = %d, dimms = %p\n", |
95 | mci->tot_dimms, mci->dimms); | 95 | mci->tot_dimms, mci->dimms); |
96 | debugf3("\tdev = %p\n", mci->dev); | 96 | debugf3("\tdev = %p\n", mci->pdev); |
97 | debugf3("\tmod_name:ctl_name = %s:%s\n", mci->mod_name, mci->ctl_name); | 97 | debugf3("\tmod_name:ctl_name = %s:%s\n", mci->mod_name, mci->ctl_name); |
98 | debugf3("\tpvt_info = %p\n\n", mci->pvt_info); | 98 | debugf3("\tpvt_info = %p\n\n", mci->pvt_info); |
99 | } | 99 | } |
@@ -428,7 +428,7 @@ struct mem_ctl_info *find_mci_by_dev(struct device *dev) | |||
428 | list_for_each(item, &mc_devices) { | 428 | list_for_each(item, &mc_devices) { |
429 | mci = list_entry(item, struct mem_ctl_info, link); | 429 | mci = list_entry(item, struct mem_ctl_info, link); |
430 | 430 | ||
431 | if (mci->dev == dev) | 431 | if (mci->pdev == dev) |
432 | return mci; | 432 | return mci; |
433 | } | 433 | } |
434 | 434 | ||
@@ -580,7 +580,7 @@ static int add_mc_to_global_list(struct mem_ctl_info *mci) | |||
580 | 580 | ||
581 | insert_before = &mc_devices; | 581 | insert_before = &mc_devices; |
582 | 582 | ||
583 | p = find_mci_by_dev(mci->dev); | 583 | p = find_mci_by_dev(mci->pdev); |
584 | if (unlikely(p != NULL)) | 584 | if (unlikely(p != NULL)) |
585 | goto fail0; | 585 | goto fail0; |
586 | 586 | ||
@@ -602,7 +602,7 @@ static int add_mc_to_global_list(struct mem_ctl_info *mci) | |||
602 | 602 | ||
603 | fail0: | 603 | fail0: |
604 | edac_printk(KERN_WARNING, EDAC_MC, | 604 | edac_printk(KERN_WARNING, EDAC_MC, |
605 | "%s (%s) %s %s already assigned %d\n", dev_name(p->dev), | 605 | "%s (%s) %s %s already assigned %d\n", dev_name(p->pdev), |
606 | edac_dev_name(mci), p->mod_name, p->ctl_name, p->mc_idx); | 606 | edac_dev_name(mci), p->mod_name, p->ctl_name, p->mc_idx); |
607 | return 1; | 607 | return 1; |
608 | 608 | ||