android/android_kernel_samsung_sm8650
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sb_edac: enable multiple PCI id tables to be used

Browse Source 
This is needed to allow separated PCI id tables for Sandy Bridge and Ivy
Bridge.

Signed-off-by: Aristeu Rozanski <arozansk@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
This commit is contained in:
Aristeu Rozanski 2013-10-30 13:27:03 -03:00 committed by Mauro Carvalho Chehab
parent cc311991a7
commit 5153a0f94c
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/edac/sb_edac.c
View File

@ -1105,12 +1105,6 @@ static void sbridge_put_all_devices(void)
} }
} }
/*
* sbridge_get_all_devices Find and perform 'get' operation on the MCH's
* device/functions we want to reference for this driver
*
* Need to 'get' device 16 func 1 and func 2
*/
static int sbridge_get_onedevice(struct pci_dev **prev, static int sbridge_get_onedevice(struct pci_dev **prev,
u8 *num_mc, u8 *num_mc,
const struct pci_id_table *table, const struct pci_id_table *table,
@ -1212,11 +1206,21 @@ static int sbridge_get_onedevice(struct pci_dev **prev,
return 0; return 0;
} }
static int sbridge_get_all_devices(u8 *num_mc) /*
* sbridge_get_all_devices - Find and perform 'get' operation on the MCH's
* device/functions we want to reference for this driver.
* Need to 'get' device 16 func 1 and func 2.
* @num_mc: pointer to the memory controllers count, to be incremented in case
* of success.
* @table: model specific table
*
* returns 0 in case of success or error code
*/
static int sbridge_get_all_devices(u8 *num_mc,
const struct pci_id_table *table)
{ {
int i, rc; int i, rc;
struct pci_dev *pdev = NULL; struct pci_dev *pdev = NULL;
const struct pci_id_table *table = pci_dev_descr_sbridge_table;
while (table && table->descr) { while (table && table->descr) {
for (i = 0; i < table->n_devs; i++) { for (i = 0; i < table->n_devs; i++) {
@ -1736,7 +1740,7 @@ static int sbridge_probe(struct pci_dev *pdev, const struct pci_device_id *id)
} }
probed++; probed++;
rc = sbridge_get_all_devices(&num_mc); rc = sbridge_get_all_devices(&num_mc, pci_dev_descr_sbridge_table);
if (unlikely(rc < 0)) if (unlikely(rc < 0))
goto fail0; goto fail0;
mc = 0; mc = 0;