|
@@ -2770,7 +2770,7 @@ static int init_one_instance(struct pci_dev *F2)
|
|
struct mem_ctl_info *mci = NULL;
|
|
struct mem_ctl_info *mci = NULL;
|
|
struct edac_mc_layer layers[2];
|
|
struct edac_mc_layer layers[2];
|
|
int err = 0, ret;
|
|
int err = 0, ret;
|
|
- u16 nid = amd_get_node_id(F2);
|
|
|
|
|
|
+ u16 nid = amd_pci_dev_to_node_id(F2);
|
|
|
|
|
|
ret = -ENOMEM;
|
|
ret = -ENOMEM;
|
|
pvt = kzalloc(sizeof(struct amd64_pvt), GFP_KERNEL);
|
|
pvt = kzalloc(sizeof(struct amd64_pvt), GFP_KERNEL);
|
|
@@ -2860,7 +2860,7 @@ err_ret:
|
|
static int probe_one_instance(struct pci_dev *pdev,
|
|
static int probe_one_instance(struct pci_dev *pdev,
|
|
const struct pci_device_id *mc_type)
|
|
const struct pci_device_id *mc_type)
|
|
{
|
|
{
|
|
- u16 nid = amd_get_node_id(pdev);
|
|
|
|
|
|
+ u16 nid = amd_pci_dev_to_node_id(pdev);
|
|
struct pci_dev *F3 = node_to_amd_nb(nid)->misc;
|
|
struct pci_dev *F3 = node_to_amd_nb(nid)->misc;
|
|
struct ecc_settings *s;
|
|
struct ecc_settings *s;
|
|
int ret = 0;
|
|
int ret = 0;
|
|
@@ -2910,7 +2910,7 @@ static void remove_one_instance(struct pci_dev *pdev)
|
|
{
|
|
{
|
|
struct mem_ctl_info *mci;
|
|
struct mem_ctl_info *mci;
|
|
struct amd64_pvt *pvt;
|
|
struct amd64_pvt *pvt;
|
|
- u16 nid = amd_get_node_id(pdev);
|
|
|
|
|
|
+ u16 nid = amd_pci_dev_to_node_id(pdev);
|
|
struct pci_dev *F3 = node_to_amd_nb(nid)->misc;
|
|
struct pci_dev *F3 = node_to_amd_nb(nid)->misc;
|
|
struct ecc_settings *s = ecc_stngs[nid];
|
|
struct ecc_settings *s = ecc_stngs[nid];
|
|
|
|
|