| Message ID | 20170604170851.3808-1-yuval.shaia@oracle.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
Hello! On 6/4/2017 8:08 PM, Yuval Shaia wrote: > Make return value void since function never return meaningfull value You only make 1 of 2 functions void. It looks like there should be 2 patches. > > Signed-off-by: Yuval Shaia <yuval.shaia@oracle.com> > --- > drivers/net/ethernet/dec/tulip/de2104x.c | 11 ++++------- > 1 file changed, 4 insertions(+), 7 deletions(-) > > diff --git a/drivers/net/ethernet/dec/tulip/de2104x.c b/drivers/net/ethernet/dec/tulip/de2104x.c > index 91b8f6f..c87b8cc 100644 > --- a/drivers/net/ethernet/dec/tulip/de2104x.c > +++ b/drivers/net/ethernet/dec/tulip/de2104x.c > @@ -1483,8 +1483,8 @@ static void __de_get_regs(struct de_private *de, u8 *buf) > de_rx_missed(de, rbuf[8]); > } > > -static int __de_get_link_ksettings(struct de_private *de, > - struct ethtool_link_ksettings *cmd) > +static void __de_get_link_ksettings(struct de_private *de, > + struct ethtool_link_ksettings *cmd) > { > ethtool_convert_legacy_u32_to_link_mode(cmd->link_modes.supported, > de->media_supported); > @@ -1517,8 +1517,6 @@ static int __de_get_link_ksettings(struct de_private *de, > cmd->base.autoneg = AUTONEG_ENABLE; > > /* ignore maxtxpkt, maxrxpkt for now */ > - > - return 0; > } > > static int __de_set_link_ksettings(struct de_private *de, > @@ -1615,13 +1613,12 @@ static int de_get_link_ksettings(struct net_device *dev, > struct ethtool_link_ksettings *cmd) > { > struct de_private *de = netdev_priv(dev); > - int rc; > > spin_lock_irq(&de->lock); > - rc = __de_get_link_ksettings(de, cmd); > + __de_get_link_ksettings(de, cmd); > spin_unlock_irq(&de->lock); > > - return rc; > + return 0; > } > > static int de_set_link_ksettings(struct net_device *dev, > MBR, Sergei
On 6/4/2017 8:22 PM, Sergei Shtylyov wrote: >> Make return value void since function never return meaningfull value > > You only make 1 of 2 functions void. It looks like there should be 2 patches. Oh, sorry, I was just blind. B-) MBR, Sergei
On Sun, Jun 04, 2017 at 08:22:05PM +0300, Sergei Shtylyov wrote: > Hello! > > On 6/4/2017 8:08 PM, Yuval Shaia wrote: > > > Make return value void since function never return meaningfull value > > You only make 1 of 2 functions void. It looks like there should be 2 patches. And what would be the second function? > > > > > Signed-off-by: Yuval Shaia <yuval.shaia@oracle.com> > > --- > > drivers/net/ethernet/dec/tulip/de2104x.c | 11 ++++------- > > 1 file changed, 4 insertions(+), 7 deletions(-) > > > > diff --git a/drivers/net/ethernet/dec/tulip/de2104x.c b/drivers/net/ethernet/dec/tulip/de2104x.c > > index 91b8f6f..c87b8cc 100644 > > --- a/drivers/net/ethernet/dec/tulip/de2104x.c > > +++ b/drivers/net/ethernet/dec/tulip/de2104x.c > > @@ -1483,8 +1483,8 @@ static void __de_get_regs(struct de_private *de, u8 *buf) > > de_rx_missed(de, rbuf[8]); > > } > > > > -static int __de_get_link_ksettings(struct de_private *de, > > - struct ethtool_link_ksettings *cmd) > > +static void __de_get_link_ksettings(struct de_private *de, > > + struct ethtool_link_ksettings *cmd) > > { > > ethtool_convert_legacy_u32_to_link_mode(cmd->link_modes.supported, > > de->media_supported); > > @@ -1517,8 +1517,6 @@ static int __de_get_link_ksettings(struct de_private *de, > > cmd->base.autoneg = AUTONEG_ENABLE; > > > > /* ignore maxtxpkt, maxrxpkt for now */ > > - > > - return 0; > > } > > > > static int __de_set_link_ksettings(struct de_private *de, > > @@ -1615,13 +1613,12 @@ static int de_get_link_ksettings(struct net_device *dev, > > struct ethtool_link_ksettings *cmd) > > { > > struct de_private *de = netdev_priv(dev); > > - int rc; > > > > spin_lock_irq(&de->lock); > > - rc = __de_get_link_ksettings(de, cmd); > > + __de_get_link_ksettings(de, cmd); > > spin_unlock_irq(&de->lock); > > > > - return rc; > > + return 0; > > } > > > > static int de_set_link_ksettings(struct net_device *dev, > > > > MBR, Sergei >
From: Yuval Shaia <yuval.shaia@oracle.com> Date: Sun, 4 Jun 2017 20:08:51 +0300 > Make return value void since function never return meaningfull value > > Signed-off-by: Yuval Shaia <yuval.shaia@oracle.com> Applied to net-next.
diff --git a/drivers/net/ethernet/dec/tulip/de2104x.c b/drivers/net/ethernet/dec/tulip/de2104x.c index 91b8f6f..c87b8cc 100644 --- a/drivers/net/ethernet/dec/tulip/de2104x.c +++ b/drivers/net/ethernet/dec/tulip/de2104x.c @@ -1483,8 +1483,8 @@ static void __de_get_regs(struct de_private *de, u8 *buf) de_rx_missed(de, rbuf[8]); } -static int __de_get_link_ksettings(struct de_private *de, - struct ethtool_link_ksettings *cmd) +static void __de_get_link_ksettings(struct de_private *de, + struct ethtool_link_ksettings *cmd) { ethtool_convert_legacy_u32_to_link_mode(cmd->link_modes.supported, de->media_supported); @@ -1517,8 +1517,6 @@ static int __de_get_link_ksettings(struct de_private *de, cmd->base.autoneg = AUTONEG_ENABLE; /* ignore maxtxpkt, maxrxpkt for now */ - - return 0; } static int __de_set_link_ksettings(struct de_private *de, @@ -1615,13 +1613,12 @@ static int de_get_link_ksettings(struct net_device *dev, struct ethtool_link_ksettings *cmd) { struct de_private *de = netdev_priv(dev); - int rc; spin_lock_irq(&de->lock); - rc = __de_get_link_ksettings(de, cmd); + __de_get_link_ksettings(de, cmd); spin_unlock_irq(&de->lock); - return rc; + return 0; } static int de_set_link_ksettings(struct net_device *dev,
Make return value void since function never return meaningfull value Signed-off-by: Yuval Shaia <yuval.shaia@oracle.com> --- drivers/net/ethernet/dec/tulip/de2104x.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-)