Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5153a0f9 authored by Aristeu Rozanski's avatar Aristeu Rozanski Committed by Mauro Carvalho Chehab
Browse files

sb_edac: enable multiple PCI id tables to be used 



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

Signed-off-by: default avatarAristeu Rozanski <arozansk@redhat.com>
Signed-off-by: default avatarMauro Carvalho Chehab <m.chehab@samsung.com>
parent cc311991

drivers/edac/sb_edac.c

+13 −9
Original line number Original line Diff line number Diff line
@@ -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;