aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2011-10-06 02:30:25 -0400
committerBorislav Petkov <borislav.petkov@amd.com>2011-10-06 06:35:46 -0400
commit1f6189ed18cbd99d90bffdbc76c3adc54418b2fd (patch)
tree0595e13ce1dbccee16361622d1c071575eacd57d
parent73ba85937b2a07b6401ba0b7ca06a112762de9f7 (diff)
amd64_edac: Cleanup return type of amd64_determine_edac_cap()
Sparse complains that edac_cap was declared as dev_type and we are returning edac_type. Historically, edac_type was correct but since then we have changed it to return a bit field. Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Link: http://lkml.kernel.org/r/20111006063025.GA2615@mwanda Signed-off-by: Borislav Petkov <borislav.petkov@amd.com>
-rw-r--r--drivers/edac/amd64_edac.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/edac/amd64_edac.c b/drivers/edac/amd64_edac.c
index 367756a48ebe..c9eee6d33e9a 100644
--- a/drivers/edac/amd64_edac.c
+++ b/drivers/edac/amd64_edac.c
@@ -768,10 +768,10 @@ static int get_channel_from_ecc_syndrome(struct mem_ctl_info *, u16);
768 * Determine if the DIMMs have ECC enabled. ECC is enabled ONLY if all the DIMMs 768 * Determine if the DIMMs have ECC enabled. ECC is enabled ONLY if all the DIMMs
769 * are ECC capable. 769 * are ECC capable.
770 */ 770 */
771static enum edac_type amd64_determine_edac_cap(struct amd64_pvt *pvt) 771static unsigned long amd64_determine_edac_cap(struct amd64_pvt *pvt)
772{ 772{
773 u8 bit; 773 u8 bit;
774 enum dev_type edac_cap = EDAC_FLAG_NONE; 774 unsigned long edac_cap = EDAC_FLAG_NONE;
775 775
776 bit = (boot_cpu_data.x86 > 0xf || pvt->ext_model >= K8_REV_F) 776 bit = (boot_cpu_data.x86 > 0xf || pvt->ext_model >= K8_REV_F)
777 ? 19 777 ? 19