| Message ID | 20200523163837.407592-21-marek.vasut+renesas@gmail.com |
|---|---|
| State | Accepted |
| Commit | acdf5d88827a0420ed0ceee3e45fa08f9d39b483 |
| Delegated to: | Joe Hershberger |
| Headers | show |
| Series | [01/30] net: eepro100: Remove EEPRO100_SROM_WRITE | expand |
On Sat, May 23, 2020 at 7:43 PM Marek Vasut <marek.vasut@gmail.com> wrote: > > Drop the inline keyword from the static functions, the compiler has a > much better overview and can decide how to inline those functions much > better. > > Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com> > --- > drivers/net/eepro100.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/drivers/net/eepro100.c b/drivers/net/eepro100.c > index a8d617c7e8..4446251e11 100644 > --- a/drivers/net/eepro100.c > +++ b/drivers/net/eepro100.c > @@ -209,23 +209,23 @@ static const char i82558_config_cmd[] = { > #define phys_to_bus(a) pci_phys_to_mem((pci_dev_t)dev->priv, a) > #endif > > -static inline int INW(struct eth_device *dev, u_long addr) > +static int INW(struct eth_device *dev, u_long addr) > { > return le16_to_cpu(readw(addr + (void *)dev->iobase)); > } > > -static inline void OUTW(struct eth_device *dev, int command, u_long addr) > +static void OUTW(struct eth_device *dev, int command, u_long addr) > { > writew(cpu_to_le16(command), addr + (void *)dev->iobase); > } > > -static inline void OUTL(struct eth_device *dev, int command, u_long addr) > +static void OUTL(struct eth_device *dev, int command, u_long addr) > { > writel(cpu_to_le32(command), addr + (void *)dev->iobase); > } > > #if defined(CONFIG_MII) || defined(CONFIG_CMD_MII) > -static inline int INL(struct eth_device *dev, u_long addr) > +static int INL(struct eth_device *dev, u_long addr) > { > return le32_to_cpu(readl(addr + (void *)dev->iobase)); > } > -- > 2.25.1 > Actually, AFAIK even if inline is used the compiled is free to do whatever he wants, this is only a suggestion, there's a GCC property named always_inline which forces the compiler to inline.
diff --git a/drivers/net/eepro100.c b/drivers/net/eepro100.c index a8d617c7e8..4446251e11 100644 --- a/drivers/net/eepro100.c +++ b/drivers/net/eepro100.c @@ -209,23 +209,23 @@ static const char i82558_config_cmd[] = { #define phys_to_bus(a) pci_phys_to_mem((pci_dev_t)dev->priv, a) #endif -static inline int INW(struct eth_device *dev, u_long addr) +static int INW(struct eth_device *dev, u_long addr) { return le16_to_cpu(readw(addr + (void *)dev->iobase)); } -static inline void OUTW(struct eth_device *dev, int command, u_long addr) +static void OUTW(struct eth_device *dev, int command, u_long addr) { writew(cpu_to_le16(command), addr + (void *)dev->iobase); } -static inline void OUTL(struct eth_device *dev, int command, u_long addr) +static void OUTL(struct eth_device *dev, int command, u_long addr) { writel(cpu_to_le32(command), addr + (void *)dev->iobase); } #if defined(CONFIG_MII) || defined(CONFIG_CMD_MII) -static inline int INL(struct eth_device *dev, u_long addr) +static int INL(struct eth_device *dev, u_long addr) { return le32_to_cpu(readl(addr + (void *)dev->iobase)); }
Drop the inline keyword from the static functions, the compiler has a much better overview and can decide how to inline those functions much better. Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com> --- drivers/net/eepro100.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)