lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

x86: microcode_amd: don't pass superfluous function pointer for get_ucode_data

Browse Source 
Impact: cleanup

Signed-off-by: Andreas Herrmann <andreas.herrmann3@amd.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Andreas Herrmann
2008-12-16 19:14:05 +01:00
committed by Ingo Molnar
parent 8c135206c8
commit 0657d9ebff
1 changed files with 12 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
arch/x86/kernel/microcode_amd.c
View File

@@ -225,8 +225,13 @@ static void apply_microcode_amd(int cpu)
uci->cpu_sig.rev = rev; uci->cpu_sig.rev = rev;
} }
static int get_ucode_data(void *to, const u8 *from, size_t n)
{
memcpy(to, from, n);
return 0;
}
static void *get_next_ucode(const u8 *buf, unsigned int size, 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 *mc_size)
{ {
unsigned int total_size; unsigned int total_size;
@@ -268,8 +273,7 @@ static void *get_next_ucode(const u8 *buf, unsigned int size,
} }
static int install_equiv_cpu_table(const u8 *buf, static int install_equiv_cpu_table(const u8 *buf)
int (*get_ucode_data)(void *, const u8 *, size_t))
{ {
#define UCODE_CONTAINER_HEADER_SIZE 12 #define UCODE_CONTAINER_HEADER_SIZE 12
u8 *container_hdr[UCODE_CONTAINER_HEADER_SIZE]; u8 *container_hdr[UCODE_CONTAINER_HEADER_SIZE];
@@ -311,8 +315,7 @@ static void free_equiv_cpu_table(void)
} }
} }
static int generic_load_microcode(int cpu, const u8 *data, size_t size, 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; struct ucode_cpu_info *uci = ucode_cpu_info + cpu;
const u8 *ucode_ptr = data; const u8 *ucode_ptr = data;
@@ -322,7 +325,7 @@ static int generic_load_microcode(int cpu, const u8 *data, size_t size,
unsigned int leftover; unsigned int leftover;
unsigned long offset; unsigned long offset;
offset = install_equiv_cpu_table(ucode_ptr, get_ucode_data); offset = install_equiv_cpu_table(ucode_ptr);
if (!offset) { if (!offset) {
printk(KERN_ERR "microcode: installing equivalent cpu table failed\n"); printk(KERN_ERR "microcode: installing equivalent cpu table failed\n");
return -EINVAL; return -EINVAL;
@@ -335,8 +338,7 @@ static int generic_load_microcode(int cpu, const u8 *data, size_t size,
unsigned int uninitialized_var(mc_size); unsigned int uninitialized_var(mc_size);
struct microcode_header_amd *mc_header; struct microcode_header_amd *mc_header;
mc = get_next_ucode(ucode_ptr, leftover, get_ucode_data, mc = get_next_ucode(ucode_ptr, leftover, &mc_size);
&mc_size);
if (!mc) if (!mc)
break; break;
@@ -370,12 +372,6 @@ static int generic_load_microcode(int cpu, const u8 *data, size_t size,
return (int)leftover; return (int)leftover;
} }
static int get_ucode_fw(void *to, const u8 *from, size_t n)
{
memcpy(to, from, n);
return 0;
}
static int request_microcode_fw(int cpu, struct device *device) static int request_microcode_fw(int cpu, struct device *device)
{ {
const char *fw_name = "amd-ucode/microcode_amd.bin"; const char *fw_name = "amd-ucode/microcode_amd.bin";
@@ -392,8 +388,7 @@ static int request_microcode_fw(int cpu, struct device *device)
return ret; return ret;
} }
ret = generic_load_microcode(cpu, firmware->data, firmware->size, ret = generic_load_microcode(cpu, firmware->data, firmware->size);
&get_ucode_fw);
release_firmware(firmware); release_firmware(firmware);