projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
net: smc911x: Drop weak alias from 32bit accessors
[oweals/u-boot.git]
/
examples
/
standalone
/
smc911x_eeprom.c
diff --git
a/examples/standalone/smc911x_eeprom.c
b/examples/standalone/smc911x_eeprom.c
index 19ad9e6297c77122587a1633b9cf25aded1fae4c..270588bcf5ea66d4bb2ba65785dbb6b6e1a37c2a 100644
(file)
--- a/
examples/standalone/smc911x_eeprom.c
+++ b/
examples/standalone/smc911x_eeprom.c
@@
-51,28
+51,22
@@
static const struct chip_id chip_ids[] = {
};
#if defined (CONFIG_SMC911X_32_BIT)
};
#if defined (CONFIG_SMC911X_32_BIT)
-static
inline u32 __
smc911x_reg_read(struct eth_device *dev, u32 offset)
+static
u32
smc911x_reg_read(struct eth_device *dev, u32 offset)
{
return *(volatile u32*)(dev->iobase + offset);
}
{
return *(volatile u32*)(dev->iobase + offset);
}
-u32 smc911x_reg_read(struct eth_device *dev, u32 offset)
- __attribute__((weak, alias("__smc911x_reg_read")));
-static inline void __smc911x_reg_write(struct eth_device *dev,
- u32 offset, u32 val)
+static void smc911x_reg_write(struct eth_device *dev, u32 offset, u32 val)
{
*(volatile u32*)(dev->iobase + offset) = val;
}
{
*(volatile u32*)(dev->iobase + offset) = val;
}
-void smc911x_reg_write(struct eth_device *dev, u32 offset, u32 val)
- __attribute__((weak, alias("__smc911x_reg_write")));
#elif defined (CONFIG_SMC911X_16_BIT)
#elif defined (CONFIG_SMC911X_16_BIT)
-static
inline
u32 smc911x_reg_read(struct eth_device *dev, u32 offset)
+static u32 smc911x_reg_read(struct eth_device *dev, u32 offset)
{
volatile u16 *addr_16 = (u16 *)(dev->iobase + offset);
{
volatile u16 *addr_16 = (u16 *)(dev->iobase + offset);
- return (
(*addr_16 & 0x0000ffff) | (*(addr_16 + 1) << 16)
);
+ return (
*addr_16 & 0x0000ffff) | (*(addr_16 + 1) << 16
);
}
}
-static inline void smc911x_reg_write(struct eth_device *dev,
- u32 offset, u32 val)
+static void smc911x_reg_write(struct eth_device *dev, u32 offset, u32 val)
{
*(volatile u16 *)(dev->iobase + offset) = (u16)val;
*(volatile u16 *)(dev->iobase + offset + 2) = (u16)(val >> 16);
{
*(volatile u16 *)(dev->iobase + offset) = (u16)val;
*(volatile u16 *)(dev->iobase + offset + 2) = (u16)(val >> 16);