Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760234Ab2JaTjw (ORCPT ); Wed, 31 Oct 2012 15:39:52 -0400 Received: from mail.skyhub.de ([78.46.96.112]:57362 "EHLO mail.skyhub.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759729Ab2JaTju (ORCPT ); Wed, 31 Oct 2012 15:39:50 -0400 Date: Wed, 31 Oct 2012 20:39:48 +0100 From: Borislav Petkov To: Daniel J Blueman Cc: Ingo Molnar , Thomas Gleixner , H Peter Anvin , Steffen Persvold , x86@kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH 4/4] AMD64 EDAC: Use appropriate name for NB indexing Message-ID: <20121031193948.GM24389@liondog.tnic> Mail-Followup-To: Borislav Petkov , Daniel J Blueman , Ingo Molnar , Thomas Gleixner , H Peter Anvin , Steffen Persvold , x86@kernel.org, linux-kernel@vger.kernel.org References: <1351662932-22279-1-git-send-email-daniel@numascale-asia.com> <1351662932-22279-4-git-send-email-daniel@numascale-asia.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <1351662932-22279-4-git-send-email-daniel@numascale-asia.com> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2308 Lines: 65 On Wed, Oct 31, 2012 at 01:55:32PM +0800, Daniel J Blueman wrote: > Use the same 'amd' prefix as related functions for clarity. > > Signed-off-by: Daniel J Blueman > --- > arch/x86/include/asm/amd_nb.h | 2 +- > drivers/edac/amd64_edac.c | 6 +++--- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/arch/x86/include/asm/amd_nb.h b/arch/x86/include/asm/amd_nb.h > index 0cc1045..39b5ddd 100644 > --- a/arch/x86/include/asm/amd_nb.h > +++ b/arch/x86/include/asm/amd_nb.h > @@ -81,7 +81,7 @@ static inline struct amd_northbridge *node_to_amd_nb(u16 node) > return (node < amd_northbridges.num) ? &amd_northbridges.nb[node] : NULL; > } > > -static inline u16 get_node_id(struct pci_dev *pdev) > +static inline u16 amd_get_node_id(struct pci_dev *pdev) > { > int i; > > diff --git a/drivers/edac/amd64_edac.c b/drivers/edac/amd64_edac.c > index 12cd675..59658b9 100644 > --- a/drivers/edac/amd64_edac.c > +++ b/drivers/edac/amd64_edac.c > @@ -2558,7 +2558,7 @@ static int amd64_init_one_instance(struct pci_dev *F2) > struct mem_ctl_info *mci = NULL; > struct edac_mc_layer layers[2]; > int err = 0, ret; > - u16 nid = get_node_id(F2); > + u16 nid = amd_get_node_id(F2); > > ret = -ENOMEM; > pvt = kzalloc(sizeof(struct amd64_pvt), GFP_KERNEL); > @@ -2649,7 +2649,7 @@ err_ret: > static int __devinit amd64_probe_one_instance(struct pci_dev *pdev, > const struct pci_device_id *mc_type) > { > - u16 nid = get_node_id(pdev); > + u16 nid = amd_get_node_id(pdev); > struct pci_dev *F3 = node_to_amd_nb(nid)->misc; > struct ecc_settings *s; > int ret = 0; > @@ -2699,7 +2699,7 @@ static void __devexit amd64_remove_one_instance(struct pci_dev *pdev) > { > struct mem_ctl_info *mci; > struct amd64_pvt *pvt; > - u16 nid = get_node_id(pdev); > + u16 nid = amd_get_node_id(pdev); > struct pci_dev *F3 = node_to_amd_nb(nid)->misc; > struct ecc_settings *s = ecc_stngs[nid]; Yeah, you can fold that change into 1/4, actually. Thanks. -- Regards/Gruss, Boris. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/