Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

e752x_edac: Drop pvt->bridge_ck

pvt->bridge_ck always points to the same device as pvt->dev_d0f1, so
get rid of the former and only use the latter.

Signed-off-by: Jean Delvare <jdelvare@suse.de>
Tested-by: Aristeu Rozanski <aris@redhat.com>
Link: http://lkml.kernel.org/r/20140224151544.16ba28a0@endymion.delvare
Cc: Mark Gross <mark.gross@intel.com>
Cc: Doug Thompson <dougthompson@xmission.com>
Signed-off-by: Borislav Petkov <bp@suse.de>

authored by

Jean Delvare and committed by
Borislav Petkov
0e089c18 fd0f5fff

+10 -18
+10 -18
drivers/edac/e752x_edac.c
··· 209 209 */ 210 210 211 211 struct e752x_pvt { 212 - struct pci_dev *bridge_ck; 213 212 struct pci_dev *dev_d0f0; 214 213 struct pci_dev *dev_d0f1; 215 214 u32 tolm; ··· 890 891 info->buf_ferr); 891 892 892 893 if (info->dram_ferr) 893 - pci_write_bits16(pvt->bridge_ck, E752X_DRAM_FERR, 894 + pci_write_bits16(pvt->dev_d0f1, E752X_DRAM_FERR, 894 895 info->dram_ferr, info->dram_ferr); 895 896 896 897 pci_write_config_dword(dev, E752X_FERR_GLOBAL, ··· 935 936 info->buf_nerr); 936 937 937 938 if (info->dram_nerr) 938 - pci_write_bits16(pvt->bridge_ck, E752X_DRAM_NERR, 939 + pci_write_bits16(pvt->dev_d0f1, E752X_DRAM_NERR, 939 940 info->dram_nerr, info->dram_nerr); 940 941 941 942 pci_write_config_dword(dev, E752X_NERR_GLOBAL, ··· 1176 1177 static int e752x_get_devs(struct pci_dev *pdev, int dev_idx, 1177 1178 struct e752x_pvt *pvt) 1178 1179 { 1179 - struct pci_dev *dev; 1180 - 1181 - pvt->bridge_ck = pci_get_device(PCI_VENDOR_ID_INTEL, 1180 + pvt->dev_d0f1 = pci_get_device(PCI_VENDOR_ID_INTEL, 1182 1181 pvt->dev_info->err_dev, NULL); 1183 1182 1184 - if (pvt->bridge_ck == NULL) { 1185 - pvt->bridge_ck = pci_scan_single_device(pdev->bus, 1183 + if (pvt->dev_d0f1 == NULL) { 1184 + pvt->dev_d0f1 = pci_scan_single_device(pdev->bus, 1186 1185 PCI_DEVFN(0, 1)); 1187 - pci_dev_get(pvt->bridge_ck); 1186 + pci_dev_get(pvt->dev_d0f1); 1188 1187 } 1189 1188 1190 - if (pvt->bridge_ck == NULL) { 1189 + if (pvt->dev_d0f1 == NULL) { 1191 1190 e752x_printk(KERN_ERR, "error reporting device not found:" 1192 1191 "vendor %x device 0x%x (broken BIOS?)\n", 1193 1192 PCI_VENDOR_ID_INTEL, e752x_devs[dev_idx].err_dev); 1194 1193 return 1; 1195 1194 } 1196 1195 1197 - dev = pci_get_device(PCI_VENDOR_ID_INTEL, 1196 + pvt->dev_d0f0 = pci_get_device(PCI_VENDOR_ID_INTEL, 1198 1197 e752x_devs[dev_idx].ctl_dev, 1199 1198 NULL); 1200 1199 1201 - if (dev == NULL) 1200 + if (pvt->dev_d0f0 == NULL) 1202 1201 goto fail; 1203 - 1204 - pvt->dev_d0f0 = dev; 1205 - pvt->dev_d0f1 = pci_dev_get(pvt->bridge_ck); 1206 1202 1207 1203 return 0; 1208 1204 1209 1205 fail: 1210 - pci_dev_put(pvt->bridge_ck); 1206 + pci_dev_put(pvt->dev_d0f1); 1211 1207 return 1; 1212 1208 } 1213 1209 ··· 1379 1385 fail: 1380 1386 pci_dev_put(pvt->dev_d0f0); 1381 1387 pci_dev_put(pvt->dev_d0f1); 1382 - pci_dev_put(pvt->bridge_ck); 1383 1388 edac_mc_free(mci); 1384 1389 1385 1390 return -ENODEV; ··· 1412 1419 pvt = (struct e752x_pvt *)mci->pvt_info; 1413 1420 pci_dev_put(pvt->dev_d0f0); 1414 1421 pci_dev_put(pvt->dev_d0f1); 1415 - pci_dev_put(pvt->bridge_ck); 1416 1422 edac_mc_free(mci); 1417 1423 } 1418 1424