summaryrefslogtreecommitdiffstats
path: root/drivers/edac/sb_edac.c
diff options
context:
space:
mode:
authorAristeu Rozanski <arozansk@redhat.com>2013-10-30 13:26:58 -0300
committerMauro Carvalho Chehab <m.chehab@samsung.com>2013-11-14 16:43:06 -0200
commit5f8a1b8a7b55937842c1c6b03c002134aacd7393 (patch)
tree7c9b78d70e42a458cc40c83bfe3dabf5efc47619 /drivers/edac/sb_edac.c
parentfb79a50926b8abadf24ec15e0e61778fa2b7d10b (diff)
downloadop-kernel-dev-5f8a1b8a7b55937842c1c6b03c002134aacd7393.zip
op-kernel-dev-5f8a1b8a7b55937842c1c6b03c002134aacd7393.tar.gz
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/sb_edac.c')
-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 bc434ad..cc4fe466 100644
--- a/drivers/edac/sb_edac.c
+++ b/drivers/edac/sb_edac.c
@@ -309,7 +309,7 @@ struct sbridge_dev {
struct sbridge_pvt {
struct pci_dev *pci_ta, *pci_ddrio, *pci_ras;
struct pci_dev *pci_sad0, *pci_sad1, *pci_ha0;
- struct pci_dev *pci_br;
+ struct pci_dev *pci_br0;
struct pci_dev *pci_tad[NUM_CHANNELS];
struct sbridge_dev *sbridge_dev;
@@ -534,10 +534,10 @@ static int get_dimm_config(struct mem_ctl_info *mci)
pvt->info.rankcfgr = SB_RANK_CFG_A;
- pci_read_config_dword(pvt->pci_br, SAD_TARGET, &reg);
+ pci_read_config_dword(pvt->pci_br0, SAD_TARGET, &reg);
pvt->sbridge_dev->source_id = SOURCE_ID(reg);
- pci_read_config_dword(pvt->pci_br, SAD_CONTROL, &reg);
+ pci_read_config_dword(pvt->pci_br0, SAD_CONTROL, &reg);
pvt->sbridge_dev->node_id = NODE_ID(reg);
edac_dbg(0, "mc#%d: Node ID: %d, source ID: %d\n",
pvt->sbridge_dev->mc,
@@ -1267,7 +1267,7 @@ static int mci_bind_devs(struct mem_ctl_info *mci,
case 13:
switch (func) {
case 6:
- pvt->pci_br = pdev;
+ pvt->pci_br0 = pdev;
break;
default:
goto error;
OpenPOWER on IntegriCloud