From: Andreas Herrmann <andreas.herrmann3@amd.com>
To: Ingo Molnar <mingo@elte.hu>, Thomas Gleixner <tglx@linutronix.de>
Cc: linux-kernel@vger.kernel.org,
Dmitry Adamushko <dmitry.adamushko@gmail.com>
Subject: [PATCH 4/10] x86: microcode_amd: fix compile warning
Date: Tue, 16 Dec 2008 19:13:00 +0100 [thread overview]
Message-ID: <20081216181300.GK7013@alberich.amd.com> (raw)
In-Reply-To: <20081216180639.GG7013@alberich.amd.com>
CC arch/x86/kernel/microcode_amd.o
arch/x86/kernel/microcode_amd.c: In function ‘request_microcode_fw’:
arch/x86/kernel/microcode_amd.c:393: warning: passing argument 2 of ‘generic_load_microcode’ discards qualifiers from pointer target type
(Respect "const" qualifier of firmware->data.)
Signed-off-by: Andreas Herrmann <andreas.herrmann3@amd.com>
---
arch/x86/kernel/microcode_amd.c | 20 +++++++++++---------
1 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/arch/x86/kernel/microcode_amd.c b/arch/x86/kernel/microcode_amd.c
index a8a0ec6..89b386c 100644
--- a/arch/x86/kernel/microcode_amd.c
+++ b/arch/x86/kernel/microcode_amd.c
@@ -225,8 +225,8 @@ static void apply_microcode_amd(int cpu)
uci->cpu_sig.rev = rev;
}
-static void *get_next_ucode(u8 *buf, unsigned int size,
- int (*get_ucode_data)(void *, const void *, size_t),
+static void *get_next_ucode(const u8 *buf, unsigned int size,
+ int (*get_ucode_data)(void *, const u8 *, size_t),
unsigned int *mc_size)
{
unsigned int total_size;
@@ -268,8 +268,8 @@ static void *get_next_ucode(u8 *buf, unsigned int size,
}
-static int install_equiv_cpu_table(u8 *buf,
- int (*get_ucode_data)(void *, const void *, size_t))
+static int install_equiv_cpu_table(const u8 *buf,
+ int (*get_ucode_data)(void *, const u8 *, size_t))
{
#define UCODE_CONTAINER_HEADER_SIZE 12
u8 *container_hdr[UCODE_CONTAINER_HEADER_SIZE];
@@ -311,11 +311,13 @@ static void free_equiv_cpu_table(void)
}
}
-static int generic_load_microcode(int cpu, void *data, size_t size,
- int (*get_ucode_data)(void *, const void *, size_t))
+static int generic_load_microcode(int cpu, const u8 *data, size_t size,
+ int (*get_ucode_data)(void *, const u8 *, size_t))
{
struct ucode_cpu_info *uci = ucode_cpu_info + cpu;
- u8 *ucode_ptr = data, *new_mc = NULL, *mc;
+ const u8 *ucode_ptr = data;
+ void *new_mc = NULL;
+ void *mc;
int new_rev = uci->cpu_sig.rev;
unsigned int leftover;
unsigned long offset;
@@ -368,7 +370,7 @@ static int generic_load_microcode(int cpu, void *data, size_t size,
return (int)leftover;
}
-static int get_ucode_fw(void *to, const void *from, size_t n)
+static int get_ucode_fw(void *to, const u8 *from, size_t n)
{
memcpy(to, from, n);
return 0;
@@ -390,7 +392,7 @@ static int request_microcode_fw(int cpu, struct device *device)
return ret;
}
- ret = generic_load_microcode(cpu, (void*)firmware->data, firmware->size,
+ ret = generic_load_microcode(cpu, firmware->data, firmware->size,
&get_ucode_fw);
release_firmware(firmware);
--
1.6.0.4
next prev parent reply other threads:[~2008-12-16 18:13 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-12-16 18:06 [PATCH 0/10] x86: microcode_amd: fixes and cleanup Andreas Herrmann
2008-12-16 18:07 ` [PATCH 1/10] x86: microcode_amd: fix wrong handling of equivalent CPU id Andreas Herrmann
2008-12-16 18:08 ` [PATCH 2/10] x86: microcode_amd: fix typos and trailing whitespaces in log messages Andreas Herrmann
2008-12-16 18:11 ` [PATCH 3/10] x86: microcode_amd: fix checkpatch warnings/errors Andreas Herrmann
2008-12-16 18:13 ` Andreas Herrmann [this message]
2008-12-16 18:14 ` [PATCH 5/10] x86: microcode_amd: don't pass superfluous function pointer for get_ucode_data Andreas Herrmann
2008-12-16 18:16 ` [PATCH 6/10] x86: microcode_amd: replace inline asm by common rdmsr/wrmsr functions Andreas Herrmann
2008-12-16 18:17 ` [PATCH 7/10] x86: microcode_amd: consolidate macro definitions Andreas Herrmann
2008-12-16 18:20 ` [PATCH 8/10] x86: microcode_amd: remove (wrong) chipset deivce ID checks Andreas Herrmann
2008-12-16 18:21 ` [PATCH 9/10] x86: microcode_amd: use 'packed' attribute for structs Andreas Herrmann
2008-12-16 18:22 ` [PATCH 10/10] x86: microcode_amd: modify log messages Andreas Herrmann
2008-12-16 23:22 ` [PATCH 0/10] x86: microcode_amd: fixes and cleanup Dmitry Adamushko
2008-12-16 23:24 ` Dmitry Adamushko
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20081216181300.GK7013@alberich.amd.com \
--to=andreas.herrmann3@amd.com \
--cc=dmitry.adamushko@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®