Doug / smarc-fsl-linux-kernel

Download as
Browse Code »

Commit fd687502dc8037aa5a4b84c570ada971106574ee

Authored by Mauro Carvalho Chehab
1 parent 53f2d02898
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

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>

Showing 28 changed files with 56 additions and 56 deletions Side-by-side Diff

drivers/edac/amd64_edac.c
Diff comments   View file @ fd68750
... ... @@ -2601,7 +2601,7 @@
2601 2601 goto err_siblings;
2602 2602  
2603 2603 mci->pvt_info = pvt;
2604   - mci->dev = &pvt->F2->dev;
  2604 + mci->pdev = &pvt->F2->dev;
2605 2605  
2606 2606 setup_mci_misc_attrs(mci, fam_type);
2607 2607  
drivers/edac/amd76x_edac.c
Diff comments   View file @ fd68750
... ... @@ -105,7 +105,7 @@
105 105 {
106 106 struct pci_dev *pdev;
107 107  
108   - pdev = to_pci_dev(mci->dev);
  108 + pdev = to_pci_dev(mci->pdev);
109 109 pci_read_config_dword(pdev, AMD76X_ECC_MODE_STATUS,
110 110 &info->ecc_mode_status);
111 111  
... ... @@ -257,7 +257,7 @@
257 257 return -ENOMEM;
258 258  
259 259 debugf0("%s(): mci = %p\n", __func__, mci);
260   - mci->dev = &pdev->dev;
  260 + mci->pdev = &pdev->dev;
261 261 mci->mtype_cap = MEM_FLAG_RDDR;
262 262 mci->edac_ctl_cap = EDAC_FLAG_NONE | EDAC_FLAG_EC | EDAC_FLAG_SECDED;
263 263 mci->edac_cap = ems_mode ?
drivers/edac/cell_edac.c
Diff comments   View file @ fd68750
... ... @@ -36,7 +36,7 @@
36 36 struct csrow_info *csrow = &mci->csrows[0];
37 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 40 priv->node, chan, ar);
41 41  
42 42 /* Address decoding is likely a bit bogus, to dbl check */
... ... @@ -59,7 +59,7 @@
59 59 struct csrow_info *csrow = &mci->csrows[0];
60 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 63 priv->node, chan, ar);
64 64  
65 65 /* Address decoding is likely a bit bogus, to dbl check */
... ... @@ -83,7 +83,7 @@
83 83 fir = in_be64(&priv->regs->mic_fir);
84 84 #ifdef DEBUG
85 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 87 priv->prev_fir = fir;
88 88 }
89 89 #endif
... ... @@ -119,7 +119,7 @@
119 119 mb(); /* sync up */
120 120 #ifdef DEBUG
121 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 123 #endif
124 124 }
125 125 }
... ... @@ -155,7 +155,7 @@
155 155 dimm->edac_mode = EDAC_SECDED;
156 156 dimm->nr_pages = nr_pages / csrow->nr_channels;
157 157 }
158   - dev_dbg(mci->dev,
  158 + dev_dbg(mci->pdev,
159 159 "Initialized on node %d, chanmask=0x%x,"
160 160 " first_page=0x%lx, nr_pages=0x%x\n",
161 161 priv->node, priv->chanmask,
... ... @@ -212,7 +212,7 @@
212 212 priv->regs = regs;
213 213 priv->node = pdev->id;
214 214 priv->chanmask = chanmask;
215   - mci->dev = &pdev->dev;
  215 + mci->pdev = &pdev->dev;
216 216 mci->mtype_cap = MEM_FLAG_XDR;
217 217 mci->edac_ctl_cap = EDAC_FLAG_NONE | EDAC_FLAG_EC | EDAC_FLAG_SECDED;
218 218 mci->edac_cap = EDAC_FLAG_EC | EDAC_FLAG_SECDED;
drivers/edac/cpc925_edac.c
Diff comments   View file @ fd68750
... ... @@ -995,7 +995,7 @@
995 995 pdata->edac_idx = edac_mc_idx++;
996 996 pdata->name = pdev->name;
997 997  
998   - mci->dev = &pdev->dev;
  998 + mci->pdev = &pdev->dev;
999 999 platform_set_drvdata(pdev, mci);
1000 1000 mci->dev_name = dev_name(&pdev->dev);
1001 1001 mci->mtype_cap = MEM_FLAG_RDDR | MEM_FLAG_DDR;
drivers/edac/e752x_edac.c
Diff comments   View file @ fd68750
... ... @@ -1308,7 +1308,7 @@
1308 1308 /* FIXME - what if different memory types are in different csrows? */
1309 1309 mci->mod_name = EDAC_MOD_STR;
1310 1310 mci->mod_ver = E752X_REVISION;
1311   - mci->dev = &pdev->dev;
  1311 + mci->pdev = &pdev->dev;
1312 1312  
1313 1313 debugf3("%s(): init pvt\n", __func__);
1314 1314 pvt = (struct e752x_pvt *)mci->pvt_info;
drivers/edac/e7xxx_edac.c
Diff comments   View file @ fd68750
... ... @@ -458,7 +458,7 @@
458 458 /* FIXME - what if different memory types are in different csrows? */
459 459 mci->mod_name = EDAC_MOD_STR;
460 460 mci->mod_ver = E7XXX_REVISION;
461   - mci->dev = &pdev->dev;
  461 + mci->pdev = &pdev->dev;
462 462 debugf3("%s(): init pvt\n", __func__);
463 463 pvt = (struct e7xxx_pvt *)mci->pvt_info;
464 464 pvt->dev_info = &e7xxx_devs[dev_idx];
drivers/edac/edac_mc.c
Diff comments   View file @ fd68750
... ... @@ -93,7 +93,7 @@
93 93 mci->nr_csrows, mci->csrows);
94 94 debugf3("\tmci->nr_dimms = %d, dimms = %p\n",
95 95 mci->tot_dimms, mci->dimms);
96   - debugf3("\tdev = %p\n", mci->dev);
  96 + debugf3("\tdev = %p\n", mci->pdev);
97 97 debugf3("\tmod_name:ctl_name = %s:%s\n", mci->mod_name, mci->ctl_name);
98 98 debugf3("\tpvt_info = %p\n\n", mci->pvt_info);
99 99 }
... ... @@ -428,7 +428,7 @@
428 428 list_for_each(item, &mc_devices) {
429 429 mci = list_entry(item, struct mem_ctl_info, link);
430 430  
431   - if (mci->dev == dev)
  431 + if (mci->pdev == dev)
432 432 return mci;
433 433 }
434 434  
... ... @@ -580,7 +580,7 @@
580 580  
581 581 insert_before = &mc_devices;
582 582  
583   - p = find_mci_by_dev(mci->dev);
  583 + p = find_mci_by_dev(mci->pdev);
584 584 if (unlikely(p != NULL))
585 585 goto fail0;
586 586  
... ... @@ -602,7 +602,7 @@
602 602  
603 603 fail0:
604 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 606 edac_dev_name(mci), p->mod_name, p->ctl_name, p->mc_idx);
607 607 return 1;
608 608  
drivers/edac/edac_mc_sysfs.c
Diff comments   View file @ fd68750
... ... @@ -916,7 +916,7 @@
916 916 INIT_LIST_HEAD(&mci->grp_kobj_list);
917 917  
918 918 /* create a symlink for the device */
919   - err = sysfs_create_link(kobj_mci, &mci->dev->kobj,
  919 + err = sysfs_create_link(kobj_mci, &mci->pdev->kobj,
920 920 EDAC_DEVICE_SYMLINK);
921 921 if (err) {
922 922 debugf1("%s() failure to create symlink\n", __func__);
drivers/edac/i3000_edac.c
Diff comments   View file @ fd68750
... ... @@ -194,7 +194,7 @@
194 194 {
195 195 struct pci_dev *pdev;
196 196  
197   - pdev = to_pci_dev(mci->dev);
  197 + pdev = to_pci_dev(mci->pdev);
198 198  
199 199 /*
200 200 * This is a mess because there is no atomic way to read all the
... ... @@ -368,7 +368,7 @@
368 368  
369 369 debugf3("MC: %s(): init mci\n", __func__);
370 370  
371   - mci->dev = &pdev->dev;
  371 + mci->pdev = &pdev->dev;
372 372 mci->mtype_cap = MEM_FLAG_DDR2;
373 373  
374 374 mci->edac_ctl_cap = EDAC_FLAG_SECDED;
drivers/edac/i3200_edac.c
Diff comments   View file @ fd68750
... ... @@ -159,7 +159,7 @@
159 159 {
160 160 struct pci_dev *pdev;
161 161  
162   - pdev = to_pci_dev(mci->dev);
  162 + pdev = to_pci_dev(mci->pdev);
163 163  
164 164 /*
165 165 * Clear any error bits.
... ... @@ -176,7 +176,7 @@
176 176 struct i3200_priv *priv = mci->pvt_info;
177 177 void __iomem *window = priv->window;
178 178  
179   - pdev = to_pci_dev(mci->dev);
  179 + pdev = to_pci_dev(mci->pdev);
180 180  
181 181 /*
182 182 * This is a mess because there is no atomic way to read all the
... ... @@ -354,7 +354,7 @@
354 354  
355 355 debugf3("MC: %s(): init mci\n", __func__);
356 356  
357   - mci->dev = &pdev->dev;
  357 + mci->pdev = &pdev->dev;
358 358 mci->mtype_cap = MEM_FLAG_DDR2;
359 359  
360 360 mci->edac_ctl_cap = EDAC_FLAG_SECDED;
drivers/edac/i5000_edac.c
Diff comments   View file @ fd68750
... ... @@ -1409,7 +1409,7 @@
1409 1409 kobject_get(&mci->edac_mci_kobj);
1410 1410 debugf0("MC: %s: %s(): mci = %p\n", __FILE__, __func__, mci);
1411 1411  
1412   - mci->dev = &pdev->dev; /* record ptr to the generic device */
  1412 + mci->pdev = &pdev->dev; /* record ptr to the generic device */
1413 1413  
1414 1414 pvt = mci->pvt_info;
1415 1415 pvt->system_address = pdev; /* Record this device in our private */
drivers/edac/i5100_edac.c
Diff comments   View file @ fd68750
... ... @@ -943,7 +943,7 @@
943 943 goto bail_disable_ch1;
944 944 }
945 945  
946   - mci->dev = &pdev->dev;
  946 + mci->pdev = &pdev->dev;
947 947  
948 948 priv = mci->pvt_info;
949 949 priv->ranksperchan = ranksperch;
drivers/edac/i5400_edac.c
Diff comments   View file @ fd68750
... ... @@ -1299,7 +1299,7 @@
1299 1299  
1300 1300 debugf0("MC: %s: %s(): mci = %p\n", __FILE__, __func__, mci);
1301 1301  
1302   - mci->dev = &pdev->dev; /* record ptr to the generic device */
  1302 + mci->pdev = &pdev->dev; /* record ptr to the generic device */
1303 1303  
1304 1304 pvt = mci->pvt_info;
1305 1305 pvt->system_address = pdev; /* Record this device in our private */
drivers/edac/i7300_edac.c
Diff comments   View file @ fd68750
... ... @@ -1057,7 +1057,7 @@
1057 1057  
1058 1058 debugf0("MC: " __FILE__ ": %s(): mci = %p\n", __func__, mci);
1059 1059  
1060   - mci->dev = &pdev->dev; /* record ptr to the generic device */
  1060 + mci->pdev = &pdev->dev; /* record ptr to the generic device */
1061 1061  
1062 1062 pvt = mci->pvt_info;
1063 1063 pvt->pci_dev_16_0_fsb_ctlr = pdev; /* Record this device in our private */
drivers/edac/i7core_edac.c
Diff comments   View file @ fd68750
... ... @@ -2122,7 +2122,7 @@
2122 2122 i7core_pci_ctl_release(pvt);
2123 2123  
2124 2124 /* Remove MC sysfs nodes */
2125   - edac_mc_del_mc(mci->dev);
  2125 + edac_mc_del_mc(mci->pdev);
2126 2126  
2127 2127 debugf1("%s: free mci struct\n", mci->ctl_name);
2128 2128 kfree(mci->ctl_name);
... ... @@ -2188,7 +2188,7 @@
2188 2188 /* Get dimm basic config */
2189 2189 get_dimm_config(mci);
2190 2190 /* record ptr to the generic device */
2191   - mci->dev = &i7core_dev->pdev[0]->dev;
  2191 + mci->pdev = &i7core_dev->pdev[0]->dev;
2192 2192 /* Set the function pointer to an actual operation function */
2193 2193 mci->edac_check = i7core_check_error;
2194 2194  
drivers/edac/i82443bxgx_edac.c
Diff comments   View file @ fd68750
... ... @@ -124,7 +124,7 @@
124 124 *info)
125 125 {
126 126 struct pci_dev *pdev;
127   - pdev = to_pci_dev(mci->dev);
  127 + pdev = to_pci_dev(mci->pdev);
128 128 pci_read_config_dword(pdev, I82443BXGX_EAP, &info->eap);
129 129 if (info->eap & I82443BXGX_EAP_OFFSET_SBE)
130 130 /* Clear error to allow next error to be reported [p.61] */
... ... @@ -260,7 +260,7 @@
260 260 return -ENOMEM;
261 261  
262 262 debugf0("MC: %s: %s(): mci = %p\n", __FILE__, __func__, mci);
263   - mci->dev = &pdev->dev;
  263 + mci->pdev = &pdev->dev;
264 264 mci->mtype_cap = MEM_FLAG_EDO | MEM_FLAG_SDR | MEM_FLAG_RDR;
265 265 mci->edac_ctl_cap = EDAC_FLAG_NONE | EDAC_FLAG_EC | EDAC_FLAG_SECDED;
266 266 pci_read_config_byte(pdev, I82443BXGX_DRAMC, &dramc);
drivers/edac/i82860_edac.c
Diff comments   View file @ fd68750
... ... @@ -67,7 +67,7 @@
67 67 {
68 68 struct pci_dev *pdev;
69 69  
70   - pdev = to_pci_dev(mci->dev);
  70 + pdev = to_pci_dev(mci->pdev);
71 71  
72 72 /*
73 73 * This is a mess because there is no atomic way to read all the
... ... @@ -211,7 +211,7 @@
211 211 return -ENOMEM;
212 212  
213 213 debugf3("%s(): init mci\n", __func__);
214   - mci->dev = &pdev->dev;
  214 + mci->pdev = &pdev->dev;
215 215 mci->mtype_cap = MEM_FLAG_DDR;
216 216 mci->edac_ctl_cap = EDAC_FLAG_NONE | EDAC_FLAG_SECDED;
217 217 /* I"m not sure about this but I think that all RDRAM is SECDED */
drivers/edac/i82875p_edac.c
Diff comments   View file @ fd68750
... ... @@ -189,7 +189,7 @@
189 189 {
190 190 struct pci_dev *pdev;
191 191  
192   - pdev = to_pci_dev(mci->dev);
  192 + pdev = to_pci_dev(mci->pdev);
193 193  
194 194 /*
195 195 * This is a mess because there is no atomic way to read all the
... ... @@ -430,7 +430,7 @@
430 430 kobject_get(&mci->edac_mci_kobj);
431 431  
432 432 debugf3("%s(): init mci\n", __func__);
433   - mci->dev = &pdev->dev;
  433 + mci->pdev = &pdev->dev;
434 434 mci->mtype_cap = MEM_FLAG_DDR;
435 435 mci->edac_ctl_cap = EDAC_FLAG_NONE | EDAC_FLAG_SECDED;
436 436 mci->edac_cap = EDAC_FLAG_UNKNOWN;
drivers/edac/i82975x_edac.c
Diff comments   View file @ fd68750
... ... @@ -241,7 +241,7 @@
241 241 {
242 242 struct pci_dev *pdev;
243 243  
244   - pdev = to_pci_dev(mci->dev);
  244 + pdev = to_pci_dev(mci->pdev);
245 245  
246 246 /*
247 247 * This is a mess because there is no atomic way to read all the
... ... @@ -559,7 +559,7 @@
559 559 }
560 560  
561 561 debugf3("%s(): init mci\n", __func__);
562   - mci->dev = &pdev->dev;
  562 + mci->pdev = &pdev->dev;
563 563 mci->mtype_cap = MEM_FLAG_DDR2;
564 564 mci->edac_ctl_cap = EDAC_FLAG_NONE | EDAC_FLAG_SECDED;
565 565 mci->edac_cap = EDAC_FLAG_NONE | EDAC_FLAG_SECDED;
drivers/edac/mpc85xx_edac.c
Diff comments   View file @ fd68750
... ... @@ -989,9 +989,9 @@
989 989 pdata = mci->pvt_info;
990 990 pdata->name = "mpc85xx_mc_err";
991 991 pdata->irq = NO_IRQ;
992   - mci->dev = &op->dev;
  992 + mci->pdev = &op->dev;
993 993 pdata->edac_idx = edac_mc_idx++;
994   - dev_set_drvdata(mci->dev, mci);
  994 + dev_set_drvdata(mci->pdev, mci);
995 995 mci->ctl_name = pdata->name;
996 996 mci->dev_name = pdata->name;
997 997  
drivers/edac/mv64x60_edac.c
Diff comments   View file @ fd68750
... ... @@ -724,7 +724,7 @@
724 724 }
725 725  
726 726 pdata = mci->pvt_info;
727   - mci->dev = &pdev->dev;
  727 + mci->pdev = &pdev->dev;
728 728 platform_set_drvdata(pdev, mci);
729 729 pdata->name = "mv64x60_mc_err";
730 730 pdata->irq = NO_IRQ;
drivers/edac/pasemi_edac.c
Diff comments   View file @ fd68750
... ... @@ -74,7 +74,7 @@
74 74  
75 75 static u32 pasemi_edac_get_error_info(struct mem_ctl_info *mci)
76 76 {
77   - struct pci_dev *pdev = to_pci_dev(mci->dev);
  77 + struct pci_dev *pdev = to_pci_dev(mci->pdev);
78 78 u32 tmp;
79 79  
80 80 pci_read_config_dword(pdev, MCDEBUG_ERRSTA,
... ... @@ -95,7 +95,7 @@
95 95  
96 96 static void pasemi_edac_process_error_info(struct mem_ctl_info *mci, u32 errsta)
97 97 {
98   - struct pci_dev *pdev = to_pci_dev(mci->dev);
  98 + struct pci_dev *pdev = to_pci_dev(mci->pdev);
99 99 u32 errlog1a;
100 100 u32 cs;
101 101  
... ... @@ -225,7 +225,7 @@
225 225 MCCFG_ERRCOR_ECC_GEN_EN |
226 226 MCCFG_ERRCOR_ECC_CRR_EN;
227 227  
228   - mci->dev = &pdev->dev;
  228 + mci->pdev = &pdev->dev;
229 229 mci->mtype_cap = MEM_FLAG_DDR | MEM_FLAG_RDDR;
230 230 mci->edac_ctl_cap = EDAC_FLAG_NONE | EDAC_FLAG_EC | EDAC_FLAG_SECDED;
231 231 mci->edac_cap = (errcor & MCCFG_ERRCOR_ECC_GEN_EN) ?
drivers/edac/ppc4xx_edac.c
Diff comments   View file @ fd68750
... ... @@ -1027,9 +1027,9 @@
1027 1027  
1028 1028 /* Initial driver pointers and private data */
1029 1029  
1030   - mci->dev = &op->dev;
  1030 + mci->pdev = &op->dev;
1031 1031  
1032   - dev_set_drvdata(mci->dev, mci);
  1032 + dev_set_drvdata(mci->pdev, mci);
1033 1033  
1034 1034 pdata = mci->pvt_info;
1035 1035  
... ... @@ -1334,7 +1334,7 @@
1334 1334 return 0;
1335 1335  
1336 1336 fail1:
1337   - edac_mc_del_mc(mci->dev);
  1337 + edac_mc_del_mc(mci->pdev);
1338 1338  
1339 1339 fail:
1340 1340 edac_mc_free(mci);
... ... @@ -1368,7 +1368,7 @@
1368 1368  
1369 1369 dcr_unmap(pdata->dcr_host, SDRAM_DCR_RESOURCE_LEN);
1370 1370  
1371   - edac_mc_del_mc(mci->dev);
  1371 + edac_mc_del_mc(mci->pdev);
1372 1372 edac_mc_free(mci);
1373 1373  
1374 1374 return 0;
drivers/edac/r82600_edac.c
Diff comments   View file @ fd68750
... ... @@ -140,7 +140,7 @@
140 140 {
141 141 struct pci_dev *pdev;
142 142  
143   - pdev = to_pci_dev(mci->dev);
  143 + pdev = to_pci_dev(mci->pdev);
144 144 pci_read_config_dword(pdev, R82600_EAP, &info->eapr);
145 145  
146 146 if (info->eapr & BIT(0))
... ... @@ -296,7 +296,7 @@
296 296 return -ENOMEM;
297 297  
298 298 debugf0("%s(): mci = %p\n", __func__, mci);
299   - mci->dev = &pdev->dev;
  299 + mci->pdev = &pdev->dev;
300 300 mci->mtype_cap = MEM_FLAG_RDDR | MEM_FLAG_DDR;
301 301 mci->edac_ctl_cap = EDAC_FLAG_NONE | EDAC_FLAG_EC | EDAC_FLAG_SECDED;
302 302 /* FIXME try to work out if the chip leads have been used for COM2
drivers/edac/sb_edac.c
Diff comments   View file @ fd68750
... ... @@ -1607,7 +1607,7 @@
1607 1607 mce_unregister_decode_chain(&sbridge_mce_dec);
1608 1608  
1609 1609 /* Remove MC sysfs nodes */
1610   - edac_mc_del_mc(mci->dev);
  1610 + edac_mc_del_mc(mci->pdev);
1611 1611  
1612 1612 debugf1("%s: free mci struct\n", mci->ctl_name);
1613 1613 kfree(mci->ctl_name);
... ... @@ -1672,7 +1672,7 @@
1672 1672 get_memory_layout(mci);
1673 1673  
1674 1674 /* record ptr to the generic device */
1675   - mci->dev = &sbridge_dev->pdev[0]->dev;
  1675 + mci->pdev = &sbridge_dev->pdev[0]->dev;
1676 1676  
1677 1677 /* add this new MC control structure to EDAC's list of MCs */
1678 1678 if (unlikely(edac_mc_add_mc(mci))) {
drivers/edac/tile_edac.c
Diff comments   View file @ fd68750
... ... @@ -69,7 +69,7 @@
69 69  
70 70 /* Check if the current error count is different from the saved one. */
71 71 if (mem_error.sbe_count != priv->ce_count) {
72   - dev_dbg(mci->dev, "ECC CE err on node %d\n", priv->node);
  72 + dev_dbg(mci->pdev, "ECC CE err on node %d\n", priv->node);
73 73 priv->ce_count = mem_error.sbe_count;
74 74 edac_mc_handle_error(HW_EVENT_ERR_CORRECTED, mci,
75 75 0, 0, 0,
... ... @@ -149,7 +149,7 @@
149 149 priv->node = pdev->id;
150 150 priv->hv_devhdl = hv_devhdl;
151 151  
152   - mci->dev = &pdev->dev;
  152 + mci->pdev = &pdev->dev;
153 153 mci->mtype_cap = MEM_FLAG_DDR2;
154 154 mci->edac_ctl_cap = EDAC_FLAG_SECDED;
155 155  
drivers/edac/x38_edac.c
Diff comments   View file @ fd68750
... ... @@ -151,7 +151,7 @@
151 151 {
152 152 struct pci_dev *pdev;
153 153  
154   - pdev = to_pci_dev(mci->dev);
  154 + pdev = to_pci_dev(mci->pdev);
155 155  
156 156 /*
157 157 * Clear any error bits.
... ... @@ -172,7 +172,7 @@
172 172 struct pci_dev *pdev;
173 173 void __iomem *window = mci->pvt_info;
174 174  
175   - pdev = to_pci_dev(mci->dev);
  175 + pdev = to_pci_dev(mci->pdev);
176 176  
177 177 /*
178 178 * This is a mess because there is no atomic way to read all the
... ... @@ -354,7 +354,7 @@
354 354  
355 355 debugf3("MC: %s(): init mci\n", __func__);
356 356  
357   - mci->dev = &pdev->dev;
  357 + mci->pdev = &pdev->dev;
358 358 mci->mtype_cap = MEM_FLAG_DDR2;
359 359  
360 360 mci->edac_ctl_cap = EDAC_FLAG_SECDED;
include/linux/edac.h
Diff comments   View file @ fd68750
... ... @@ -567,7 +567,7 @@
567 567 * unique. dev pointer should be sufficiently unique, but
568 568 * BUS:SLOT.FUNC numbers may not be unique.
569 569 */
570   - struct device *dev;
  570 + struct device *pdev;
571 571 const char *mod_name;
572 572 const char *mod_ver;
573 573 const char *ctl_name;