提交 5f8a1b8a 编写于 作者: A Aristeu Rozanski 提交者: Mauro Carvalho Chehab

sb_edac: rename pci_br

Ivy Bridge has more than one, so rename pci_br to pci_br0
Signed-off-by: NAristeu Rozanski <arozansk@redhat.com>
Signed-off-by: NMauro Carvalho Chehab <m.chehab@samsung.com>
上级 fb79a509
...@@ -309,7 +309,7 @@ struct sbridge_dev { ...@@ -309,7 +309,7 @@ struct sbridge_dev {
struct sbridge_pvt { struct sbridge_pvt {
struct pci_dev *pci_ta, *pci_ddrio, *pci_ras; struct pci_dev *pci_ta, *pci_ddrio, *pci_ras;
struct pci_dev *pci_sad0, *pci_sad1, *pci_ha0; 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 pci_dev *pci_tad[NUM_CHANNELS];
struct sbridge_dev *sbridge_dev; struct sbridge_dev *sbridge_dev;
...@@ -534,10 +534,10 @@ static int get_dimm_config(struct mem_ctl_info *mci) ...@@ -534,10 +534,10 @@ static int get_dimm_config(struct mem_ctl_info *mci)
pvt->info.rankcfgr = SB_RANK_CFG_A; 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); 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); pvt->sbridge_dev->node_id = NODE_ID(reg);
edac_dbg(0, "mc#%d: Node ID: %d, source ID: %d\n", edac_dbg(0, "mc#%d: Node ID: %d, source ID: %d\n",
pvt->sbridge_dev->mc, pvt->sbridge_dev->mc,
...@@ -1267,7 +1267,7 @@ static int mci_bind_devs(struct mem_ctl_info *mci, ...@@ -1267,7 +1267,7 @@ static int mci_bind_devs(struct mem_ctl_info *mci,
case 13: case 13:
switch (func) { switch (func) {
case 6: case 6:
pvt->pci_br = pdev; pvt->pci_br0 = pdev;
break; break;
default: default:
goto error; goto error;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册