diff mbox

[U-Boot,04/49] i2c: use __weak

Message ID 1412801889-14400-5-git-send-email-jeroen@myspectrum.nl
State Changes Requested
Delegated to: Heiko Schocher
Headers show

Commit Message

Jeroen Hofstee Oct. 8, 2014, 8:57 p.m. UTC
Signed-off-by: Jeroen Hofstee <jeroen@myspectrum.nl>
---
 arch/arm/cpu/arm926ejs/cache.c | 5 +----
 drivers/i2c/i2c_core.c         | 4 +---
 2 files changed, 2 insertions(+), 7 deletions(-)

Comments

Heiko Schocher Oct. 9, 2014, 5 a.m. UTC | #1
Hello Jeroen,

first, thanks for this clean up!

Am 08.10.2014 22:57, schrieb Jeroen Hofstee:
> Signed-off-by: Jeroen Hofstee<jeroen@myspectrum.nl>
> ---
>   arch/arm/cpu/arm926ejs/cache.c | 5 +----

This change seems to have nothing to do with the subject ...
could you please split this?

>   drivers/i2c/i2c_core.c         | 4 +---
>   2 files changed, 2 insertions(+), 7 deletions(-)

Beside of this nitpick:
Acked-by: Heiko Schocher <hs@denx.de>

bye,
Heiko
Jeroen Hofstee Oct. 9, 2014, 6:14 p.m. UTC | #2
Hello Heiko,

On 09-10-14 07:00, Heiko Schocher wrote:
>
> Am 08.10.2014 22:57, schrieb Jeroen Hofstee:
>> Signed-off-by: Jeroen Hofstee<jeroen@myspectrum.nl>
>> ---
>>   arch/arm/cpu/arm926ejs/cache.c | 5 +----
>
> This change seems to have nothing to do with the subject ...
> could you please split this?
>

No problem, I likely accidentally squashed them.
I will repost this patch with out it and append a new one.

Regards,
Jeroen
Tom Rini Oct. 27, 2014, 12:31 a.m. UTC | #3
On Thu, Oct 09, 2014 at 08:14:40PM +0200, Jeroen Hofstee wrote:

> Hello Heiko,
> 
> On 09-10-14 07:00, Heiko Schocher wrote:
> >
> >Am 08.10.2014 22:57, schrieb Jeroen Hofstee:
> >>Signed-off-by: Jeroen Hofstee<jeroen@myspectrum.nl>
> >>---
> >>  arch/arm/cpu/arm926ejs/cache.c | 5 +----
> >
> >This change seems to have nothing to do with the subject ...
> >could you please split this?
> >
> 
> No problem, I likely accidentally squashed them.
> I will repost this patch with out it and append a new one.

Did I miss it?  Thanks!
Jeroen Hofstee Oct. 27, 2014, 7:16 p.m. UTC | #4
Hello Tom,

On 27-10-14 01:31, Tom Rini wrote:
> On Thu, Oct 09, 2014 at 08:14:40PM +0200, Jeroen Hofstee wrote:
>
>> Hello Heiko,
>>
>> On 09-10-14 07:00, Heiko Schocher wrote:
>>> Am 08.10.2014 22:57, schrieb Jeroen Hofstee:
>>>> Signed-off-by: Jeroen Hofstee<jeroen@myspectrum.nl>
>>>> ---
>>>>   arch/arm/cpu/arm926ejs/cache.c | 5 +----
>>> This change seems to have nothing to do with the subject ...
>>> could you please split this?
>>>
>> No problem, I likely accidentally squashed them.
>> I will repost this patch with out it and append a new one.
> Did I miss it?  Thanks!
>
>

Thanks for applying most of them. I reposted the remaining ones.

Regards,
Jeroen
diff mbox

Patch

diff --git a/arch/arm/cpu/arm926ejs/cache.c b/arch/arm/cpu/arm926ejs/cache.c
index e86c2ed..8d7873c 100644
--- a/arch/arm/cpu/arm926ejs/cache.c
+++ b/arch/arm/cpu/arm926ejs/cache.c
@@ -99,7 +99,4 @@  void flush_cache(unsigned long start, unsigned long size)
 /*
  * Stub implementations for l2 cache operations
  */
-void __l2_cache_disable(void) {}
-
-void l2_cache_disable(void)
-	__attribute__((weak, alias("__l2_cache_disable")));
+__weak void l2_cache_disable(void) {}
diff --git a/drivers/i2c/i2c_core.c b/drivers/i2c/i2c_core.c
index 18d6736..7f63987 100644
--- a/drivers/i2c/i2c_core.c
+++ b/drivers/i2c/i2c_core.c
@@ -395,9 +395,7 @@  void i2c_reg_write(uint8_t addr, uint8_t reg, uint8_t val)
 	i2c_write(addr, reg, 1, &val, 1);
 }
 
-void __i2c_init(int speed, int slaveaddr)
+__weak void i2c_init(int speed, int slaveaddr)
 {
 	i2c_init_bus(i2c_get_bus_num(), speed, slaveaddr);
 }
-void i2c_init(int speed, int slaveaddr)
-	__attribute__((weak, alias("__i2c_init")));