x86, amd-nb: Rename CPU PCI id define for F4

PATCH In review Borislav Petkov 3 participants 6 messages Mar 30, 2011 – Mar 31, 2011

Subsystems (2)

x86 PCI

lore

Share & tools

lore

Borislav Petkov

author

2011-03-30 18:35 UTC #0 lore raw

PATCH 1/1 x86, amd-nb: Rename CPU PCI id define for F4

With increasing number of PCI function ids, add the PCI function id in the define name instead of its symbolic name in the BKDG for more clarity. This renames function 4 define.

Cc Ingo Molnar <[email protected]>

Cc Jesse Barnes <[email protected]>

Signed-off-by Borislav Petkov <[email protected]>

---
 arch/x86/kernel/amd_nb.c |    2 +-
 include/linux/pci_ids.h  |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

arch/x86/kernel/amd_nb.c +1 -1

index 6801959..4c39baa 100644
@@ -21,7 +21,7 @@ const struct pci_device_id amd_nb_misc_ids[] = {
 EXPORT_SYMBOL(amd_nb_misc_ids);
 
 static struct pci_device_id amd_nb_link_ids[] = {
-	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_15H_NB_LINK) },
+	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_15H_NB_F4) },
 	{}
 };

include/linux/pci_ids.h +1 -1

index 11fd381..4e2c915 100644
@@ -518,7 +518,7 @@
 #define PCI_DEVICE_ID_AMD_11H_NB_MISC	0x1303
 #define PCI_DEVICE_ID_AMD_11H_NB_LINK	0x1304
 #define PCI_DEVICE_ID_AMD_15H_NB_F3	0x1603
-#define PCI_DEVICE_ID_AMD_15H_NB_LINK	0x1604
+#define PCI_DEVICE_ID_AMD_15H_NB_F4	0x1604
 #define PCI_DEVICE_ID_AMD_CNB17H_F3	0x1703
 #define PCI_DEVICE_ID_AMD_LANCE		0x2000
 #define PCI_DEVICE_ID_AMD_LANCE_HOME	0x2001

Signature · 12 lines

1.7.4.rc2


-- 
Regards/Gruss,
Boris.

Advanced Micro Devices GmbH
Einsteinring 24, 85609 Dornach
General Managers: Alberto Bozzo, Andrew Bowd
Registration: Dornach, Gemeinde Aschheim, Landkreis Muenchen
Registergericht Muenchen, HRB Nr. 43632

tip-bot for Borislav Petkov

author

2011-03-31 07:05 UTC #1 lore raw

Commit-ID:  cb6c8520f6f6bba7b7e1a6de3360a8edfd8243b6
Gitweb:     http://git.kernel.org/tip/cb6c8520f6f6bba7b7e1a6de3360a8edfd8243b6
Author:     Borislav Petkov <[email protected]>
AuthorDate: Wed, 30 Mar 2011 20:34:47 +0200
Committer:  Ingo Molnar <[email protected]>
CommitDate: Thu, 31 Mar 2011 08:51:38 +0200

x86, amd-nb: Rename CPU PCI id define for F4

With increasing number of PCI function ids, add the PCI function id in the define name instead of its symbolic name in the BKDG for more clarity. This renames function 4 define.

Signed-off-by Borislav Petkov <[email protected]>

Cc Jesse Barnes <[email protected]>

LKML-Reference: <20110330183447.GA3668@aftab>

Signed-off-by Ingo Molnar <[email protected]>

---
 arch/x86/kernel/amd_nb.c |    2 +-
 include/linux/pci_ids.h  |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

arch/x86/kernel/amd_nb.c +1 -1

index 6801959..4c39baa 100644
@@ -21,7 +21,7 @@ const struct pci_device_id amd_nb_misc_ids[] = {
 EXPORT_SYMBOL(amd_nb_misc_ids);
 
 static struct pci_device_id amd_nb_link_ids[] = {
-	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_15H_NB_LINK) },
+	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_15H_NB_F4) },
 	{}
 };

include/linux/pci_ids.h +1 -1

index 11fd381..4e2c915 100644
@@ -518,7 +518,7 @@
 #define PCI_DEVICE_ID_AMD_11H_NB_MISC	0x1303
 #define PCI_DEVICE_ID_AMD_11H_NB_LINK	0x1304
 #define PCI_DEVICE_ID_AMD_15H_NB_F3	0x1603
-#define PCI_DEVICE_ID_AMD_15H_NB_LINK	0x1604
+#define PCI_DEVICE_ID_AMD_15H_NB_F4	0x1604
 #define PCI_DEVICE_ID_AMD_CNB17H_F3	0x1703
 #define PCI_DEVICE_ID_AMD_LANCE		0x2000
 #define PCI_DEVICE_ID_AMD_LANCE_HOME	0x2001

Jesse Barnes

Acked-by

2011-03-31 16:00 UTC #2 lore raw

Quoted 7 lines · On Thu, 31 Mar 2011 07:04:41 GMT tip-bot for Borislav Petkov <[email protected]>…

Commit-ID:  cb6c8520f6f6bba7b7e1a6de3360a8edfd8243b6
Gitweb:     http://git.kernel.org/tip/cb6c8520f6f6bba7b7e1a6de3360a8edfd8243b6
Author:     Borislav Petkov <[email protected]>
AuthorDate: Wed, 30 Mar 2011 20:34:47 +0200
Committer:  Ingo Molnar <[email protected]>
CommitDate: Thu, 31 Mar 2011 08:51:38 +0200

Quoted 6 lines

x86, amd-nb: Rename CPU PCI id define for F4
With increasing number of PCI function ids, add the PCI function id in the define name instead of its symbolic name in the BKDG for more clarity. This renames function 4 define.

I guess I don't see how a rename is urgent, but you can add my

Acked-by Jesse Barnes <[email protected]>

Signature · 1 line

Jesse Barnes, Intel Open Source Technology Center

Ingo Molnar

2011-03-31 16:06 UTC #3 lore raw

Quoted 12 lines · Jesse Barnes

Quoted 9 lines · On Thu, 31 Mar 2011 07:04:41 GMT tip-bot for Borislav Petkov <[email protected]>…
Commit-ID:  cb6c8520f6f6bba7b7e1a6de3360a8edfd8243b6
Gitweb:     http://git.kernel.org/tip/cb6c8520f6f6bba7b7e1a6de3360a8edfd8243b6
Author:     Borislav Petkov <[email protected]>
AuthorDate: Wed, 30 Mar 2011 20:34:47 +0200
Committer:  Ingo Molnar <[email protected]>
CommitDate: Thu, 31 Mar 2011 08:51:38 +0200
x86, amd-nb: Rename CPU PCI id define for F4

Quoted 7 lines

Quoted 4 lines
With increasing number of PCI function ids, add the PCI function id in the define name instead of its symbolic name in the BKDG for more clarity. This renames function 4 define.
I guess I don't see how a rename is urgent, but you can add my
Acked-by Jesse Barnes <[email protected]>

The new ID went upstream via cb293250c71f in the merge window, so i wanted to shorten the life-time of the obsoleted name - that will also reduce the chance of any conflicts.

Thanks,

Ingo

Jesse Barnes

2011-03-31 16:14 UTC #4 lore raw

Quoted 20 lines · On Thu, 31 Mar 2011 18:05:52 +0200 Ingo Molnar <[email protected]> wrote:

Quoted 17 lines · Jesse Barnes
Quoted 13 lines · On Thu, 31 Mar 2011 07:04:41 GMT tip-bot for Borislav Petkov <[email protected]>…
Commit-ID:  cb6c8520f6f6bba7b7e1a6de3360a8edfd8243b6
Gitweb:     http://git.kernel.org/tip/cb6c8520f6f6bba7b7e1a6de3360a8edfd8243b6
Author:     Borislav Petkov <[email protected]>
AuthorDate: Wed, 30 Mar 2011 20:34:47 +0200
Committer:  Ingo Molnar <[email protected]>
CommitDate: Thu, 31 Mar 2011 08:51:38 +0200
x86, amd-nb: Rename CPU PCI id define for F4
With increasing number of PCI function ids, add the PCI function id in the define name instead of its symbolic name in the BKDG for more clarity. This renames function 4 define.

Quoted 6 lines

Quoted 2 lines
I guess I don't see how a rename is urgent, but you can add my
Acked-by Jesse Barnes <[email protected]>
The new ID went upstream via cb293250c71f in the merge window, so i wanted to shorten the life-time of the obsoleted name - that will also reduce the chance of any conflicts.

Sounds good, thanks.

Signature · 1 line

Jesse Barnes, Intel Open Source Technology Center

Borislav Petkov

author

2011-03-31 16:28 UTC #5 lore raw

Quoted 5 lines · Jesse Barnes

Quoted 3 lines
The new ID went upstream via cb293250c71f in the merge window, so i wanted to shorten the life-time of the obsoleted name - that will also reduce the chance of any conflicts.
Sounds good, thanks.

Yep, definitely a good idea since I have a couple of patches coming up for the next merge window and they use this particular #define. That's why I sent it out now, thinking it is trivial enough to go in and thus to avoid conflicts at merge window time.

Thanks.

Signature · 8 lines

Regards/Gruss,
Boris.

Advanced Micro Devices GmbH
Einsteinring 24, 85609 Dornach
General Managers: Alberto Bozzo, Andrew Bowd
Registration: Dornach, Gemeinde Aschheim, Landkreis Muenchen
Registergericht Muenchen, HRB Nr. 43632