Skip to contentSkip to conversation

mxs: Use __weak annotation to simplify code

PATCH New Fabio Estevam 2 participants 2 messages Jan 8, 2013

Subsystems (2)
Arm (32-bit) Arm i.MX and Layerscape
lore
Share & tools
lore

Fabio Estevam

author
#0 lore raw

PATCH 1/1 mxs: Use __weak annotation to simplify code

Using the __weak annotation can make the code cleaner.

Signed-off-by Fabio Estevam <[email protected]>
---
 arch/arm/cpu/arm926ejs/mxs/mxs.c          |    6 ++----
 arch/arm/cpu/arm926ejs/mxs/spl_mem_init.c |    5 ++---
 2 files changed, 4 insertions(+), 7 deletions(-)
arch/arm/cpu/arm926ejs/mxs/mxs.c +2 -4
index 6ce8019..741ae38 100644
@@ -35,6 +35,7 @@
 #include <asm/arch/iomux.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/sys_proto.h>
+#include <linux/compiler.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 

@@ -276,7 +277,7 @@ int cpu_eth_init(bd_t *bis)
 }
 #endif
 
-static void __mx28_adjust_mac(int dev_id, unsigned char *mac)
+__weak void mx28_adjust_mac(int dev_id, unsigned char *mac)
 {
 	mac[0] = 0x00;
 	mac[1] = 0x04; /* Use FSL vendor MAC address by default */

@@ -285,9 +286,6 @@ static void __mx28_adjust_mac(int dev_id, unsigned char *mac)
 		mac[5] += 1;
 }
 
-void mx28_adjust_mac(int dev_id, unsigned char *mac)
-	__attribute__((weak, alias("__mx28_adjust_mac")));
-
 #ifdef	CONFIG_MX28_FEC_MAC_IN_OCOTP
 
 #define	MXS_OCOTP_MAX_TIMEOUT	1000000
arch/arm/cpu/arm926ejs/mxs/spl_mem_init.c +2 -3
index 401c513..a3ff3fa 100644
@@ -27,6 +27,7 @@
 #include <config.h>
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
+#include <linux/compiler.h>
 
 #include "mxs_init.h"
 

@@ -88,11 +89,9 @@ static uint32_t dram_vals[] = {
 #endif
 };
 
-void __mxs_adjust_memory_params(uint32_t *dram_vals)
+__weak void mxs_adjust_memory_params(uint32_t *dram_vals)
 {
 }
-void mxs_adjust_memory_params(uint32_t *dram_vals)
-	__attribute__((weak, alias("__mxs_adjust_memory_params")));
 
 static void initialize_dram_values(void)
 {
Signature · 1 line
1.7.9.5