Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 5f8a1b8a7b55937842c1c6b03c002134aacd7393

Authored by Aristeu Rozanski
Committed by Mauro Carvalho Chehab
1 parent fb79a50926
Exists in smarc-imx_3.14.28_1.0.0_ga and in 1 other branch imx_3.14.28_1.0.0_ga

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>

Showing 1 changed file with 4 additions and 4 deletions Side-by-side Diff

drivers/edac/sb_edac.c
Diff comments   View file @ 5f8a1b8
... ... @@ -309,7 +309,7 @@
309 309 struct sbridge_pvt {
310 310 struct pci_dev *pci_ta, *pci_ddrio, *pci_ras;
311 311 struct pci_dev *pci_sad0, *pci_sad1, *pci_ha0;
312   - struct pci_dev *pci_br;
  312 + struct pci_dev *pci_br0;
313 313 struct pci_dev *pci_tad[NUM_CHANNELS];
314 314  
315 315 struct sbridge_dev *sbridge_dev;
316 316  
... ... @@ -534,10 +534,10 @@
534 534  
535 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 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 541 pvt->sbridge_dev->node_id = NODE_ID(reg);
542 542 edac_dbg(0, "mc#%d: Node ID: %d, source ID: %d\n",
543 543 pvt->sbridge_dev->mc,
... ... @@ -1267,7 +1267,7 @@
1267 1267 case 13:
1268 1268 switch (func) {
1269 1269 case 6:
1270   - pvt->pci_br = pdev;
  1270 + pvt->pci_br0 = pdev;
1271 1271 break;
1272 1272 default:
1273 1273 goto error;