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

x86/amd_nb, EDAC: Rename amd_get_node_id()

This function doesn't give us the "Node ID" as the function name
suggests. Rather, it receives a PCI device as argument, checks
the available F3 PCI device IDs in the system and returns the
index of the matching Bus/Device IDs.

Rename it to amd_pci_dev_to_node_id().

No functional change is introduced.

Suggested-by: Ingo Molnar <mingo@kernel.org>
Signed-off-by: Aravind Gopalakrishnan <Aravind.Gopalakrishnan@amd.com>
Signed-off-by: Borislav Petkov <bp@suse.de>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Suravee Suthikulpanit <Suravee.Suthikulpanit@amd.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: linux-edac <linux-edac@vger.kernel.org>
Link: http://lkml.kernel.org/r/1445246268-26285-3-git-send-email-bp@alien8.de
Signed-off-by: Ingo Molnar <mingo@kernel.org>

authored by

Aravind Gopalakrishnan and committed by
Ingo Molnar
1a6775c1 eb6db83d

+4 -4
+1 -1
arch/x86/include/asm/amd_nb.h
··· 81 81 return (node < amd_northbridges.num) ? &amd_northbridges.nb[node] : NULL; 82 82 } 83 83 84 - static inline u16 amd_get_node_id(struct pci_dev *pdev) 84 + static inline u16 amd_pci_dev_to_node_id(struct pci_dev *pdev) 85 85 { 86 86 struct pci_dev *misc; 87 87 int i;
+3 -3
drivers/edac/amd64_edac.c
··· 2770 2770 struct mem_ctl_info *mci = NULL; 2771 2771 struct edac_mc_layer layers[2]; 2772 2772 int err = 0, ret; 2773 - u16 nid = amd_get_node_id(F2); 2773 + u16 nid = amd_pci_dev_to_node_id(F2); 2774 2774 2775 2775 ret = -ENOMEM; 2776 2776 pvt = kzalloc(sizeof(struct amd64_pvt), GFP_KERNEL); ··· 2860 2860 static int probe_one_instance(struct pci_dev *pdev, 2861 2861 const struct pci_device_id *mc_type) 2862 2862 { 2863 - u16 nid = amd_get_node_id(pdev); 2863 + u16 nid = amd_pci_dev_to_node_id(pdev); 2864 2864 struct pci_dev *F3 = node_to_amd_nb(nid)->misc; 2865 2865 struct ecc_settings *s; 2866 2866 int ret = 0; ··· 2910 2910 { 2911 2911 struct mem_ctl_info *mci; 2912 2912 struct amd64_pvt *pvt; 2913 - u16 nid = amd_get_node_id(pdev); 2913 + u16 nid = amd_pci_dev_to_node_id(pdev); 2914 2914 struct pci_dev *F3 = node_to_amd_nb(nid)->misc; 2915 2915 struct ecc_settings *s = ecc_stngs[nid]; 2916 2916