Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fd687502 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

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: default avatarAristeu Rozanski <arozansk@redhat.com>
Acked-by: default avatarChris 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: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 53f2d028

drivers/edac/amd64_edac.c

+1 −1
Original line number Diff line number Diff line
@@ -2601,7 +2601,7 @@ static int amd64_init_one_instance(struct pci_dev *F2) 
		goto err_siblings;



	mci->pvt_info = pvt;

	mci->dev = &pvt->F2->dev;

	mci->pdev = &pvt->F2->dev;



	setup_mci_misc_attrs(mci, fam_type);

drivers/edac/amd76x_edac.c

+2 −2
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ static void amd76x_get_error_info(struct mem_ctl_info *mci, 
{

	struct pci_dev *pdev;



	pdev = to_pci_dev(mci->dev);

	pdev = to_pci_dev(mci->pdev);

	pci_read_config_dword(pdev, AMD76X_ECC_MODE_STATUS,

			&info->ecc_mode_status);
@@ -257,7 +257,7 @@ static int amd76x_probe1(struct pci_dev *pdev, int dev_idx) 
		return -ENOMEM;



	debugf0("%s(): mci = %p\n", __func__, mci);

	mci->dev = &pdev->dev;

	mci->pdev = &pdev->dev;

	mci->mtype_cap = MEM_FLAG_RDDR;

	mci->edac_ctl_cap = EDAC_FLAG_NONE | EDAC_FLAG_EC | EDAC_FLAG_SECDED;

	mci->edac_cap = ems_mode ?

drivers/edac/cell_edac.c

+6 −6
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ static void cell_edac_count_ce(struct mem_ctl_info *mci, int chan, u64 ar) 
	struct csrow_info		*csrow = &mci->csrows[0];

	unsigned long			address, pfn, offset, syndrome;



	dev_dbg(mci->dev, "ECC CE err on node %d, channel %d, ar = 0x%016llx\n",

	dev_dbg(mci->pdev, "ECC CE err on node %d, channel %d, ar = 0x%016llx\n",

		priv->node, chan, ar);



	/* 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) 
	struct csrow_info		*csrow = &mci->csrows[0];

	unsigned long			address, pfn, offset;



	dev_dbg(mci->dev, "ECC UE err on node %d, channel %d, ar = 0x%016llx\n",

	dev_dbg(mci->pdev, "ECC UE err on node %d, channel %d, ar = 0x%016llx\n",

		priv->node, chan, ar);



	/* Address decoding is likely a bit bogus, to dbl check */
@@ -83,7 +83,7 @@ static void cell_edac_check(struct mem_ctl_info *mci) 
	fir = in_be64(&priv->regs->mic_fir);

#ifdef DEBUG

	if (fir != priv->prev_fir) {

		dev_dbg(mci->dev, "fir change : 0x%016lx\n", fir);

		dev_dbg(mci->pdev, "fir change : 0x%016lx\n", fir);

		priv->prev_fir = fir;

	}

#endif
@@ -119,7 +119,7 @@ static void cell_edac_check(struct mem_ctl_info *mci) 
		mb();	/* sync up */

#ifdef DEBUG

		fir = in_be64(&priv->regs->mic_fir);

		dev_dbg(mci->dev, "fir clear  : 0x%016lx\n", fir);

		dev_dbg(mci->pdev, "fir clear  : 0x%016lx\n", fir);

#endif

	}

}
@@ -155,7 +155,7 @@ static void __devinit cell_edac_init_csrows(struct mem_ctl_info *mci) 
			dimm->edac_mode = EDAC_SECDED;

			dimm->nr_pages = nr_pages / csrow->nr_channels;

		}

		dev_dbg(mci->dev,

		dev_dbg(mci->pdev,

			"Initialized on node %d, chanmask=0x%x,"

			" first_page=0x%lx, nr_pages=0x%x\n",

			priv->node, priv->chanmask,
@@ -212,7 +212,7 @@ static int __devinit cell_edac_probe(struct platform_device *pdev) 
	priv->regs = regs;

	priv->node = pdev->id;

	priv->chanmask = chanmask;

	mci->dev = &pdev->dev;

	mci->pdev = &pdev->dev;

	mci->mtype_cap = MEM_FLAG_XDR;

	mci->edac_ctl_cap = EDAC_FLAG_NONE | EDAC_FLAG_EC | EDAC_FLAG_SECDED;

	mci->edac_cap = EDAC_FLAG_EC | EDAC_FLAG_SECDED;

drivers/edac/cpc925_edac.c

+1 −1
Original line number Diff line number Diff line
@@ -995,7 +995,7 @@ static int __devinit cpc925_probe(struct platform_device *pdev) 
	pdata->edac_idx = edac_mc_idx++;

	pdata->name = pdev->name;



	mci->dev = &pdev->dev;

	mci->pdev = &pdev->dev;

	platform_set_drvdata(pdev, mci);

	mci->dev_name = dev_name(&pdev->dev);

	mci->mtype_cap = MEM_FLAG_RDDR | MEM_FLAG_DDR;

drivers/edac/e752x_edac.c

+1 −1
Original line number Diff line number Diff line
@@ -1308,7 +1308,7 @@ static int e752x_probe1(struct pci_dev *pdev, int dev_idx) 
	/* FIXME - what if different memory types are in different csrows? */

	mci->mod_name = EDAC_MOD_STR;

	mci->mod_ver = E752X_REVISION;

	mci->dev = &pdev->dev;

	mci->pdev = &pdev->dev;



	debugf3("%s(): init pvt\n", __func__);

	pvt = (struct e752x_pvt *)mci->pvt_info;