aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/edac
diff options
context:
space:
mode:
authorAristeu Rozanski <arozansk@redhat.com>2013-10-30 12:26:58 -0400
committerMauro Carvalho Chehab <m.chehab@samsung.com>2013-11-14 13:43:06 -0500
commit5f8a1b8a7b55937842c1c6b03c002134aacd7393 (patch)
tree7c9b78d70e42a458cc40c83bfe3dabf5efc47619 /drivers/edac
parentfb79a50926b8abadf24ec15e0e61778fa2b7d10b (diff)
sb_edac: rename pci_br
Ivy Bridge has more than one, so rename pci_br to pci_br0 Signed-off-by: Aristeu Rozanski <arozansk@redhat.com> Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Diffstat (limited to 'drivers/edac')
-rw-r--r--drivers/edac/sb_edac.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/edac/sb_edac.c b/drivers/edac/sb_edac.c
index bc434ad5465d..cc4fe466236e 100644
--- a/drivers/edac/sb_edac.c
+++ b/drivers/edac/sb_edac.c
@@ -309,7 +309,7 @@ struct sbridge_dev {
309struct sbridge_pvt { 309struct sbridge_pvt {
310 struct pci_dev *pci_ta, *pci_ddrio, *pci_ras; 310 struct pci_dev *pci_ta, *pci_ddrio, *pci_ras;
311 struct pci_dev *pci_sad0, *pci_sad1, *pci_ha0; 311 struct pci_dev *pci_sad0, *pci_sad1, *pci_ha0;
312 struct pci_dev *pci_br; 312 struct pci_dev *pci_br0;
313 struct pci_dev *pci_tad[NUM_CHANNELS]; 313 struct pci_dev *pci_tad[NUM_CHANNELS];
314 314
315 struct sbridge_dev *sbridge_dev; 315 struct sbridge_dev *sbridge_dev;
@@ -534,10 +534,10 @@ static int get_dimm_config(struct mem_ctl_info *mci)
534 534
535 pvt->info.rankcfgr = SB_RANK_CFG_A; 535 pvt->info.rankcfgr = SB_RANK_CFG_A;
536 536
537 pci_read_config_dword(pvt->pci_br, SAD_TARGET, &reg); 537 pci_read_config_dword(pvt->pci_br0, SAD_TARGET, &reg);
538 pvt->sbridge_dev->source_id = SOURCE_ID(reg); 538 pvt->sbridge_dev->source_id = SOURCE_ID(reg);
539 539
540 pci_read_config_dword(pvt->pci_br, SAD_CONTROL, &reg); 540 pci_read_config_dword(pvt->pci_br0, SAD_CONTROL, &reg);
541 pvt->sbridge_dev->node_id = NODE_ID(reg); 541 pvt->sbridge_dev->node_id = NODE_ID(reg);
542 edac_dbg(0, "mc#%d: Node ID: %d, source ID: %d\n", 542 edac_dbg(0, "mc#%d: Node ID: %d, source ID: %d\n",
543 pvt->sbridge_dev->mc, 543 pvt->sbridge_dev->mc,
@@ -1267,7 +1267,7 @@ static int mci_bind_devs(struct mem_ctl_info *mci,
1267 case 13: 1267 case 13:
1268 switch (func) { 1268 switch (func) {
1269 case 6: 1269 case 6:
1270 pvt->pci_br = pdev; 1270 pvt->pci_br0 = pdev;
1271 break; 1271 break;
1272 default: 1272 default:
1273 goto error; 1273 goto error;