* [PATCH RESEND] x86, amd-nb: Misc correctness fixes
@ 2011-03-02 19:38 Borislav Petkov
2011-03-03 9:14 ` Ingo Molnar
0 siblings, 1 reply; 5+ messages in thread
From: Borislav Petkov @ 2011-03-02 19:38 UTC (permalink / raw)
To: H. Peter Anvin, Ingo Molnar, Thomas Gleixner; +Cc: x86, LKML
Make functions used strictly in bool context return bool. Also, fixup
used types and comments, and make a local function static, while at it.
Signed-off-by: Borislav Petkov <borislav.petkov@amd.com>
---
Against tip/x86/amd_nb.
arch/x86/include/asm/amd_nb.h | 12 ++++++------
arch/x86/kernel/amd_nb.c | 18 ++++++++++--------
2 files changed, 16 insertions(+), 14 deletions(-)
diff --git a/arch/x86/include/asm/amd_nb.h b/arch/x86/include/asm/amd_nb.h
index 2b33c4d..527fb96 100644
--- a/arch/x86/include/asm/amd_nb.h
+++ b/arch/x86/include/asm/amd_nb.h
@@ -13,7 +13,7 @@ extern const struct pci_device_id amd_nb_misc_ids[];
extern const struct amd_nb_bus_dev_range amd_nb_bus_dev_ranges[];
struct bootnode;
-extern int early_is_amd_nb(u32 value);
+extern bool early_is_amd_nb(u32 value);
extern int amd_cache_northbridges(void);
extern void amd_flush_garts(void);
extern int amd_numa_init(unsigned long start_pfn, unsigned long end_pfn);
@@ -38,18 +38,18 @@ struct amd_northbridge_info {
};
extern struct amd_northbridge_info amd_northbridges;
-#define AMD_NB_GART 0x1
-#define AMD_NB_L3_INDEX_DISABLE 0x2
-#define AMD_NB_L3_PARTITIONING 0x4
+#define AMD_NB_GART BIT(0)
+#define AMD_NB_L3_INDEX_DISABLE BIT(1)
+#define AMD_NB_L3_PARTITIONING BIT(2)
#ifdef CONFIG_AMD_NB
-static inline int amd_nb_num(void)
+static inline u16 amd_nb_num(void)
{
return amd_northbridges.num;
}
-static inline int amd_nb_has_feature(int feature)
+static inline bool amd_nb_has_feature(unsigned feature)
{
return ((amd_northbridges.flags & feature) == feature);
}
diff --git a/arch/x86/kernel/amd_nb.c b/arch/x86/kernel/amd_nb.c
index ed3c2e5..b57ade1 100644
--- a/arch/x86/kernel/amd_nb.c
+++ b/arch/x86/kernel/amd_nb.c
@@ -48,7 +48,7 @@ static struct pci_dev *next_northbridge(struct pci_dev *dev,
int amd_cache_northbridges(void)
{
- int i = 0;
+ u16 i = 0;
struct amd_northbridge *nb;
struct pci_dev *misc, *link;
@@ -103,9 +103,11 @@ int amd_cache_northbridges(void)
}
EXPORT_SYMBOL_GPL(amd_cache_northbridges);
-/* Ignores subdevice/subvendor but as far as I can figure out
- they're useless anyways */
-int __init early_is_amd_nb(u32 device)
+/*
+ * Ignores subdevice/subvendor but as far as I can figure out
+ * they're useless anyways
+ */
+bool __init early_is_amd_nb(u32 device)
{
const struct pci_device_id *id;
u32 vendor = device & 0xffff;
@@ -113,8 +115,8 @@ int __init early_is_amd_nb(u32 device)
device >>= 16;
for (id = amd_nb_misc_ids; id->vendor; id++)
if (vendor == id->vendor && device == id->device)
- return 1;
- return 0;
+ return true;
+ return false;
}
int amd_get_subcaches(int cpu)
@@ -176,9 +178,9 @@ int amd_set_subcaches(int cpu, int mask)
return 0;
}
-int amd_cache_gart(void)
+static int amd_cache_gart(void)
{
- int i;
+ u16 i;
if (!amd_nb_has_feature(AMD_NB_GART))
return 0;
--
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
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH RESEND] x86, amd-nb: Misc correctness fixes
2011-03-02 19:38 [PATCH RESEND] x86, amd-nb: Misc correctness fixes Borislav Petkov
@ 2011-03-03 9:14 ` Ingo Molnar
2011-03-03 11:59 ` Borislav Petkov
0 siblings, 1 reply; 5+ messages in thread
From: Ingo Molnar @ 2011-03-03 9:14 UTC (permalink / raw)
To: Borislav Petkov; +Cc: H. Peter Anvin, Thomas Gleixner, x86, LKML
* Borislav Petkov <bp@amd64.org> wrote:
> Make functions used strictly in bool context return bool. Also, fixup
> used types and comments, and make a local function static, while at it.
>
> Signed-off-by: Borislav Petkov <borislav.petkov@amd.com>
I'm confused about the title - a 'correctness fix' is one that fixes an actual bug.
Did you mean 'cleanliness fixes'?
Also, checkpatch outputs a warning that looks legit.
Thanks,
Ingo
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH RESEND] x86, amd-nb: Misc correctness fixes
2011-03-03 9:14 ` Ingo Molnar
@ 2011-03-03 11:59 ` Borislav Petkov
2011-03-03 12:05 ` Ingo Molnar
2011-03-03 12:33 ` [tip:x86/amd-nb] x86, amd-nb: Misc cleanliness fixes tip-bot for Borislav Petkov
0 siblings, 2 replies; 5+ messages in thread
From: Borislav Petkov @ 2011-03-03 11:59 UTC (permalink / raw)
To: Ingo Molnar; +Cc: Borislav Petkov, H. Peter Anvin, Thomas Gleixner, x86, LKML
On Thu, Mar 03, 2011 at 04:14:40AM -0500, Ingo Molnar wrote:
> I'm confused about the title - a 'correctness fix' is one that fixes an actual bug.
>
> Did you mean 'cleanliness fixes'?
Yes sir, this is basically a result from the 'make W=1 ..' thing I've
been playing with lately. Fixed.
> Also, checkpatch outputs a warning that looks legit.
Won't happen again. Hadn't enabled the pre-commit hook for checkpatch on
that machine. Fixed.
Here's a better version:
--
From: Borislav Petkov <borislav.petkov@amd.com>
Date: Mon, 21 Feb 2011 15:54:36 +0100
Subject: [PATCH] x86, amd-nb: Misc cleanliness fixes
Make functions used strictly in bool context return bool. Also, fixup
used types and comments, and make a local function static, while at it.
Signed-off-by: Borislav Petkov <borislav.petkov@amd.com>
---
arch/x86/include/asm/amd_nb.h | 12 ++++++------
arch/x86/kernel/amd_nb.c | 18 ++++++++++--------
2 files changed, 16 insertions(+), 14 deletions(-)
diff --git a/arch/x86/include/asm/amd_nb.h b/arch/x86/include/asm/amd_nb.h
index 2b33c4d..527fb96 100644
--- a/arch/x86/include/asm/amd_nb.h
+++ b/arch/x86/include/asm/amd_nb.h
@@ -13,7 +13,7 @@ extern const struct pci_device_id amd_nb_misc_ids[];
extern const struct amd_nb_bus_dev_range amd_nb_bus_dev_ranges[];
struct bootnode;
-extern int early_is_amd_nb(u32 value);
+extern bool early_is_amd_nb(u32 value);
extern int amd_cache_northbridges(void);
extern void amd_flush_garts(void);
extern int amd_numa_init(unsigned long start_pfn, unsigned long end_pfn);
@@ -38,18 +38,18 @@ struct amd_northbridge_info {
};
extern struct amd_northbridge_info amd_northbridges;
-#define AMD_NB_GART 0x1
-#define AMD_NB_L3_INDEX_DISABLE 0x2
-#define AMD_NB_L3_PARTITIONING 0x4
+#define AMD_NB_GART BIT(0)
+#define AMD_NB_L3_INDEX_DISABLE BIT(1)
+#define AMD_NB_L3_PARTITIONING BIT(2)
#ifdef CONFIG_AMD_NB
-static inline int amd_nb_num(void)
+static inline u16 amd_nb_num(void)
{
return amd_northbridges.num;
}
-static inline int amd_nb_has_feature(int feature)
+static inline bool amd_nb_has_feature(unsigned feature)
{
return ((amd_northbridges.flags & feature) == feature);
}
diff --git a/arch/x86/kernel/amd_nb.c b/arch/x86/kernel/amd_nb.c
index ed3c2e5..6563419 100644
--- a/arch/x86/kernel/amd_nb.c
+++ b/arch/x86/kernel/amd_nb.c
@@ -48,7 +48,7 @@ static struct pci_dev *next_northbridge(struct pci_dev *dev,
int amd_cache_northbridges(void)
{
- int i = 0;
+ u16 i = 0;
struct amd_northbridge *nb;
struct pci_dev *misc, *link;
@@ -103,9 +103,11 @@ int amd_cache_northbridges(void)
}
EXPORT_SYMBOL_GPL(amd_cache_northbridges);
-/* Ignores subdevice/subvendor but as far as I can figure out
- they're useless anyways */
-int __init early_is_amd_nb(u32 device)
+/*
+ * Ignores subdevice/subvendor but as far as I can figure out
+ * they're useless anyways
+ */
+bool __init early_is_amd_nb(u32 device)
{
const struct pci_device_id *id;
u32 vendor = device & 0xffff;
@@ -113,8 +115,8 @@ int __init early_is_amd_nb(u32 device)
device >>= 16;
for (id = amd_nb_misc_ids; id->vendor; id++)
if (vendor == id->vendor && device == id->device)
- return 1;
- return 0;
+ return true;
+ return false;
}
int amd_get_subcaches(int cpu)
@@ -176,9 +178,9 @@ int amd_set_subcaches(int cpu, int mask)
return 0;
}
-int amd_cache_gart(void)
+static int amd_cache_gart(void)
{
- int i;
+ u16 i;
if (!amd_nb_has_feature(AMD_NB_GART))
return 0;
--
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
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH RESEND] x86, amd-nb: Misc correctness fixes
2011-03-03 11:59 ` Borislav Petkov
@ 2011-03-03 12:05 ` Ingo Molnar
2011-03-03 12:33 ` [tip:x86/amd-nb] x86, amd-nb: Misc cleanliness fixes tip-bot for Borislav Petkov
1 sibling, 0 replies; 5+ messages in thread
From: Ingo Molnar @ 2011-03-03 12:05 UTC (permalink / raw)
To: Borislav Petkov; +Cc: H. Peter Anvin, Thomas Gleixner, x86, LKML
* Borislav Petkov <bp@amd64.org> wrote:
> On Thu, Mar 03, 2011 at 04:14:40AM -0500, Ingo Molnar wrote:
> > I'm confused about the title - a 'correctness fix' is one that fixes an actual bug.
> >
> > Did you mean 'cleanliness fixes'?
>
> Yes sir, this is basically a result from the 'make W=1 ..' thing I've
> been playing with lately. Fixed.
>
> > Also, checkpatch outputs a warning that looks legit.
>
> Won't happen again. Hadn't enabled the pre-commit hook for checkpatch on
> that machine. Fixed.
Note that there are checkpatch warnings that are crappy - especially the col80 ones
tend to produce 'fixes' that are far worse than the offense. So it's not an
automatism, it's a case by case tool.
> Here's a better version:
Applied, thanks!
Ingo
^ permalink raw reply [flat|nested] 5+ messages in thread
* [tip:x86/amd-nb] x86, amd-nb: Misc cleanliness fixes
2011-03-03 11:59 ` Borislav Petkov
2011-03-03 12:05 ` Ingo Molnar
@ 2011-03-03 12:33 ` tip-bot for Borislav Petkov
1 sibling, 0 replies; 5+ messages in thread
From: tip-bot for Borislav Petkov @ 2011-03-03 12:33 UTC (permalink / raw)
To: linux-tip-commits
Cc: linux-kernel, hpa, mingo, tglx, bp, mingo, borislav.petkov
Commit-ID: 84fd1d35cc868a4f7590b6dbdae2d7761287b97a
Gitweb: http://git.kernel.org/tip/84fd1d35cc868a4f7590b6dbdae2d7761287b97a
Author: Borislav Petkov <bp@amd64.org>
AuthorDate: Thu, 3 Mar 2011 12:59:32 +0100
Committer: Ingo Molnar <mingo@elte.hu>
CommitDate: Thu, 3 Mar 2011 13:06:20 +0100
x86, amd-nb: Misc cleanliness fixes
Make functions used strictly in bool context return bool. Also,
fixup used types and comments, and make a local function static,
while at it.
Signed-off-by: Borislav Petkov <borislav.petkov@amd.com>
Cc: Borislav Petkov <bp@amd64.org>
LKML-Reference: <20110303115932.GA8603@aftab>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
---
arch/x86/include/asm/amd_nb.h | 12 ++++++------
arch/x86/kernel/amd_nb.c | 18 ++++++++++--------
2 files changed, 16 insertions(+), 14 deletions(-)
diff --git a/arch/x86/include/asm/amd_nb.h b/arch/x86/include/asm/amd_nb.h
index 2b33c4d..527fb96 100644
--- a/arch/x86/include/asm/amd_nb.h
+++ b/arch/x86/include/asm/amd_nb.h
@@ -13,7 +13,7 @@ extern const struct pci_device_id amd_nb_misc_ids[];
extern const struct amd_nb_bus_dev_range amd_nb_bus_dev_ranges[];
struct bootnode;
-extern int early_is_amd_nb(u32 value);
+extern bool early_is_amd_nb(u32 value);
extern int amd_cache_northbridges(void);
extern void amd_flush_garts(void);
extern int amd_numa_init(unsigned long start_pfn, unsigned long end_pfn);
@@ -38,18 +38,18 @@ struct amd_northbridge_info {
};
extern struct amd_northbridge_info amd_northbridges;
-#define AMD_NB_GART 0x1
-#define AMD_NB_L3_INDEX_DISABLE 0x2
-#define AMD_NB_L3_PARTITIONING 0x4
+#define AMD_NB_GART BIT(0)
+#define AMD_NB_L3_INDEX_DISABLE BIT(1)
+#define AMD_NB_L3_PARTITIONING BIT(2)
#ifdef CONFIG_AMD_NB
-static inline int amd_nb_num(void)
+static inline u16 amd_nb_num(void)
{
return amd_northbridges.num;
}
-static inline int amd_nb_has_feature(int feature)
+static inline bool amd_nb_has_feature(unsigned feature)
{
return ((amd_northbridges.flags & feature) == feature);
}
diff --git a/arch/x86/kernel/amd_nb.c b/arch/x86/kernel/amd_nb.c
index ed3c2e5..6563419 100644
--- a/arch/x86/kernel/amd_nb.c
+++ b/arch/x86/kernel/amd_nb.c
@@ -48,7 +48,7 @@ static struct pci_dev *next_northbridge(struct pci_dev *dev,
int amd_cache_northbridges(void)
{
- int i = 0;
+ u16 i = 0;
struct amd_northbridge *nb;
struct pci_dev *misc, *link;
@@ -103,9 +103,11 @@ int amd_cache_northbridges(void)
}
EXPORT_SYMBOL_GPL(amd_cache_northbridges);
-/* Ignores subdevice/subvendor but as far as I can figure out
- they're useless anyways */
-int __init early_is_amd_nb(u32 device)
+/*
+ * Ignores subdevice/subvendor but as far as I can figure out
+ * they're useless anyways
+ */
+bool __init early_is_amd_nb(u32 device)
{
const struct pci_device_id *id;
u32 vendor = device & 0xffff;
@@ -113,8 +115,8 @@ int __init early_is_amd_nb(u32 device)
device >>= 16;
for (id = amd_nb_misc_ids; id->vendor; id++)
if (vendor == id->vendor && device == id->device)
- return 1;
- return 0;
+ return true;
+ return false;
}
int amd_get_subcaches(int cpu)
@@ -176,9 +178,9 @@ int amd_set_subcaches(int cpu, int mask)
return 0;
}
-int amd_cache_gart(void)
+static int amd_cache_gart(void)
{
- int i;
+ u16 i;
if (!amd_nb_has_feature(AMD_NB_GART))
return 0;
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2011-03-03 12:34 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-03-02 19:38 [PATCH RESEND] x86, amd-nb: Misc correctness fixes Borislav Petkov
2011-03-03 9:14 ` Ingo Molnar
2011-03-03 11:59 ` Borislav Petkov
2011-03-03 12:05 ` Ingo Molnar
2011-03-03 12:33 ` [tip:x86/amd-nb] x86, amd-nb: Misc cleanliness fixes tip-bot for Borislav Petkov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox