Merge branch 'x86-headers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[deliverable/linux.git] / arch / x86 / kernel / amd_nb.c

diff --git a/arch/x86/kernel/amd_nb.c b/arch/x86/kernel/amd_nb.c
index 0f0252e932b1679c9aa6c975b9304c71c419b206..4fdf6230d93c9353f0a276f99564a29a19b2b5ab 100644 (file)
--- a/arch/x86/kernel/amd_nb.c
+++ b/arch/x86/kernel/amd_nb.c
@@ -219,24 +219,22 @@ int amd_set_subcaches(int cpu, unsigned long mask)
        return 0;
 }
 
-static int amd_cache_gart(void)
+static void amd_cache_gart(void)
 {
        u16 i;
 
-       if (!amd_nb_has_feature(AMD_NB_GART))
-               return 0;
-
-       flush_words = kmalloc(amd_nb_num() * sizeof(u32), GFP_KERNEL);
-       if (!flush_words) {
-               amd_northbridges.flags &= ~AMD_NB_GART;
-               return -ENOMEM;
-       }
+       if (!amd_nb_has_feature(AMD_NB_GART))
+               return;
 
-       for (i = 0; i != amd_nb_num(); i++)
-               pci_read_config_dword(node_to_amd_nb(i)->misc, 0x9c,
-                                     &flush_words[i]);
+       flush_words = kmalloc(amd_nb_num() * sizeof(u32), GFP_KERNEL);
+       if (!flush_words) {
+               amd_northbridges.flags &= ~AMD_NB_GART;
+               pr_notice("Cannot initialize GART flush words, GART support disabled\n");
+               return;
+       }
 
-       return 0;
+       for (i = 0; i != amd_nb_num(); i++)
+               pci_read_config_dword(node_to_amd_nb(i)->misc, 0x9c, &flush_words[i]);
 }
 
 void amd_flush_garts(void)
@@ -278,17 +276,10 @@ EXPORT_SYMBOL_GPL(amd_flush_garts);
 
 static __init int init_amd_nbs(void)
 {
-       int err = 0;
+       amd_cache_northbridges();
+       amd_cache_gart();
 
-       err = amd_cache_northbridges();
-
-       if (err < 0)
-               pr_notice("Cannot enumerate AMD northbridges\n");
-
-       if (amd_cache_gart() < 0)
-               pr_notice("Cannot initialize GART flush words, GART support disabled\n");
-
-       return err;
+       return 0;
 }
 
 /* This has to go after the PCI subsystem */