| Message ID | 20200315165843.81753-8-marek.vasut+renesas@gmail.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | net: smc911x: Convert to DM | expand |
On Sun, Mar 15, 2020 at 12:00 PM Marek Vasut <marek.vasut at gmail.com> wrote: > > These accessors are not overriden by any board, and even if they were, > this is something which should be handled via DM now, so remove the > weak alias option. Moreover, drop the inline keyword, as the compiler > can decide better. > > Signed-off-by: Marek Vasut <marek.vasut+renesas at gmail.com> > Cc: Joe Hershberger <joe.hershberger at ni.com> > Cc: Masahiro Yamada <yamada.masahiro at socionext.com> Acked-by: Joe Hershberger <joe.hershberger at ni.com>
On Mon, Mar 16, 2020 at 2:00 AM Marek Vasut <marek.vasut at gmail.com> wrote: > > These accessors are not overriden by any board, and even if they were, > this is something which should be handled via DM now, so remove the > weak alias option. Moreover, drop the inline keyword, as the compiler > can decide better. > > Signed-off-by: Marek Vasut <marek.vasut+renesas at gmail.com> > Cc: Joe Hershberger <joe.hershberger at ni.com> > Cc: Masahiro Yamada <yamada.masahiro at socionext.com> This is good. I would swap the patch order 06 and 07 so that I would need to touch only one file, though. > --- > drivers/net/smc911x.c | 14 ++++---------- > examples/standalone/smc911x_eeprom.c | 16 +++++----------- > 2 files changed, 9 insertions(+), 21 deletions(-) > > diff --git a/drivers/net/smc911x.c b/drivers/net/smc911x.c > index c806757605..d798df9ec6 100644 > --- a/drivers/net/smc911x.c > +++ b/drivers/net/smc911x.c > @@ -44,28 +44,22 @@ static const struct chip_id chip_ids[] = { > #endif > > #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); > } > -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; > } > -void smc911x_reg_write(struct eth_device *dev, u32 offset, u32 val) > - __attribute__((weak, alias("__smc911x_reg_write"))); > #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); > 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); > diff --git a/examples/standalone/smc911x_eeprom.c b/examples/standalone/smc911x_eeprom.c > index 19ad9e6297..270588bcf5 100644 > --- 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) > -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); > } > -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; > } > -void smc911x_reg_write(struct eth_device *dev, u32 offset, u32 val) > - __attribute__((weak, alias("__smc911x_reg_write"))); > #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); > - 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); > -- > 2.25.0 >
On Mon, Mar 16, 2020 at 2:00 AM Marek Vasut <marek.vasut at gmail.com> wrote: > > These accessors are not overriden by any board, and even if they were, One more nit. overriden -> overridden
diff --git a/drivers/net/smc911x.c b/drivers/net/smc911x.c index c806757605..d798df9ec6 100644 --- a/drivers/net/smc911x.c +++ b/drivers/net/smc911x.c @@ -44,28 +44,22 @@ static const struct chip_id chip_ids[] = { #endif #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); } -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; } -void smc911x_reg_write(struct eth_device *dev, u32 offset, u32 val) - __attribute__((weak, alias("__smc911x_reg_write"))); #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); 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); diff --git a/examples/standalone/smc911x_eeprom.c b/examples/standalone/smc911x_eeprom.c index 19ad9e6297..270588bcf5 100644 --- 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) -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); } -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; } -void smc911x_reg_write(struct eth_device *dev, u32 offset, u32 val) - __attribute__((weak, alias("__smc911x_reg_write"))); #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); - 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);
These accessors are not overriden by any board, and even if they were, this is something which should be handled via DM now, so remove the weak alias option. Moreover, drop the inline keyword, as the compiler can decide better. Signed-off-by: Marek Vasut <marek.vasut+renesas at gmail.com> Cc: Joe Hershberger <joe.hershberger at ni.com> Cc: Masahiro Yamada <yamada.masahiro at socionext.com> --- drivers/net/smc911x.c | 14 ++++---------- examples/standalone/smc911x_eeprom.c | 16 +++++----------- 2 files changed, 9 insertions(+), 21 deletions(-)