| Message ID | 20230510200247.1534793-1-u.kleine-koenig@pengutronix.de (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 7f88efc8162cc6d516cacf1d82edc923b423483f |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net-next] net: samsung: sxgbe: Make sxgbe_drv_remove() return void | expand |
On Wed, May 10, 2023 at 10:02:47PM +0200, Uwe Kleine-König wrote: > sxgbe_drv_remove() returned zero unconditionally, so it can be converted > to return void without losing anything. The upside is that it becomes > more obvious in its callers that there is no error to handle. > > Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Reviewed-by: Simon Horman <simon.horman@corigine.com>
On Thu, May 11, 2023 at 12:17:40PM +0200, Simon Horman wrote: > On Wed, May 10, 2023 at 10:02:47PM +0200, Uwe Kleine-König wrote: > > sxgbe_drv_remove() returned zero unconditionally, so it can be converted > > to return void without losing anything. The upside is that it becomes > > more obvious in its callers that there is no error to handle. > > > > Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> > > Reviewed-by: Simon Horman <simon.horman@corigine.com> Sorry, minor nit. Perhaps the subject prefix should be 'net: sxgbe: ', for consistency. Or 'sxgbe: ' because the 'net: ' part is largely meaningless.
On Thu, May 11, 2023 at 12:28:54PM +0200, Simon Horman wrote: > On Thu, May 11, 2023 at 12:17:40PM +0200, Simon Horman wrote: > > On Wed, May 10, 2023 at 10:02:47PM +0200, Uwe Kleine-König wrote: > > > sxgbe_drv_remove() returned zero unconditionally, so it can be converted > > > to return void without losing anything. The upside is that it becomes > > > more obvious in its callers that there is no error to handle. > > > > > > Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> > > > > Reviewed-by: Simon Horman <simon.horman@corigine.com> > > Sorry, minor nit. > Perhaps the subject prefix should be 'net: sxgbe: ', for consistency. > Or 'sxgbe: ' because the 'net: ' part is largely meaningless. I'd not drop "net:". Looking at the output of git log --format=%s next/master -- drivers/net/ethernet/samsung/sxgbe/ | sed 's/:[^:]*$//' | sort | uniq -c | sort -n the clear winner is "net: sxgbe: ". If and when I will resend this patch, I'll adapt accordingly. If it's taken as is (or the committer adapts the subject line) that's fine for me, too. Best regards Uwe
On Thu, May 11, 2023 at 12:45:09PM +0200, Uwe Kleine-König wrote: > On Thu, May 11, 2023 at 12:28:54PM +0200, Simon Horman wrote: > > On Thu, May 11, 2023 at 12:17:40PM +0200, Simon Horman wrote: > > > On Wed, May 10, 2023 at 10:02:47PM +0200, Uwe Kleine-König wrote: > > > > sxgbe_drv_remove() returned zero unconditionally, so it can be converted > > > > to return void without losing anything. The upside is that it becomes > > > > more obvious in its callers that there is no error to handle. > > > > > > > > Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> > > > > > > Reviewed-by: Simon Horman <simon.horman@corigine.com> > > > > Sorry, minor nit. > > Perhaps the subject prefix should be 'net: sxgbe: ', for consistency. > > Or 'sxgbe: ' because the 'net: ' part is largely meaningless. > > I'd not drop "net:". Looking at the output of > > git log --format=%s next/master -- drivers/net/ethernet/samsung/sxgbe/ | sed 's/:[^:]*$//' | sort | uniq -c | sort -n > > the clear winner is "net: sxgbe: ". > > If and when I will resend this patch, I'll adapt accordingly. If it's > taken as is (or the committer adapts the subject line) that's fine for > me, too. Thanks, that's good for me on all counts.
Hello: This patch was applied to netdev/net-next.git (main) by David S. Miller <davem@davemloft.net>: On Wed, 10 May 2023 22:02:47 +0200 you wrote: > sxgbe_drv_remove() returned zero unconditionally, so it can be converted > to return void without losing anything. The upside is that it becomes > more obvious in its callers that there is no error to handle. > > Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> > --- > drivers/net/ethernet/samsung/sxgbe/sxgbe_common.h | 2 +- > drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c | 4 +--- > drivers/net/ethernet/samsung/sxgbe/sxgbe_platform.c | 5 +++-- > 3 files changed, 5 insertions(+), 6 deletions(-) > > [...] Here is the summary with links: - [net-next] net: samsung: sxgbe: Make sxgbe_drv_remove() return void https://git.kernel.org/netdev/net-next/c/7f88efc8162c You are awesome, thank you!
diff --git a/drivers/net/ethernet/samsung/sxgbe/sxgbe_common.h b/drivers/net/ethernet/samsung/sxgbe/sxgbe_common.h index 0f45107db8dd..d14e0cfc3a6b 100644 --- a/drivers/net/ethernet/samsung/sxgbe/sxgbe_common.h +++ b/drivers/net/ethernet/samsung/sxgbe/sxgbe_common.h @@ -511,7 +511,7 @@ struct sxgbe_priv_data { struct sxgbe_priv_data *sxgbe_drv_probe(struct device *device, struct sxgbe_plat_data *plat_dat, void __iomem *addr); -int sxgbe_drv_remove(struct net_device *ndev); +void sxgbe_drv_remove(struct net_device *ndev); void sxgbe_set_ethtool_ops(struct net_device *netdev); int sxgbe_mdio_unregister(struct net_device *ndev); int sxgbe_mdio_register(struct net_device *ndev); diff --git a/drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c b/drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c index 9664f029fa16..71439825ea4e 100644 --- a/drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c +++ b/drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c @@ -2203,7 +2203,7 @@ struct sxgbe_priv_data *sxgbe_drv_probe(struct device *device, * Description: this function resets the TX/RX processes, disables the MAC RX/TX * changes the link status, releases the DMA descriptor rings. */ -int sxgbe_drv_remove(struct net_device *ndev) +void sxgbe_drv_remove(struct net_device *ndev) { struct sxgbe_priv_data *priv = netdev_priv(ndev); u8 queue_num; @@ -2231,8 +2231,6 @@ int sxgbe_drv_remove(struct net_device *ndev) kfree(priv->hw); free_netdev(ndev); - - return 0; } #ifdef CONFIG_PM diff --git a/drivers/net/ethernet/samsung/sxgbe/sxgbe_platform.c b/drivers/net/ethernet/samsung/sxgbe/sxgbe_platform.c index 4e5526303f07..fb59ff94509a 100644 --- a/drivers/net/ethernet/samsung/sxgbe/sxgbe_platform.c +++ b/drivers/net/ethernet/samsung/sxgbe/sxgbe_platform.c @@ -172,9 +172,10 @@ static int sxgbe_platform_probe(struct platform_device *pdev) static int sxgbe_platform_remove(struct platform_device *pdev) { struct net_device *ndev = platform_get_drvdata(pdev); - int ret = sxgbe_drv_remove(ndev); - return ret; + sxgbe_drv_remove(ndev); + + return 0; } #ifdef CONFIG_PM
sxgbe_drv_remove() returned zero unconditionally, so it can be converted to return void without losing anything. The upside is that it becomes more obvious in its callers that there is no error to handle. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> --- drivers/net/ethernet/samsung/sxgbe/sxgbe_common.h | 2 +- drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c | 4 +--- drivers/net/ethernet/samsung/sxgbe/sxgbe_platform.c | 5 +++-- 3 files changed, 5 insertions(+), 6 deletions(-) base-commit: ac9a78681b921877518763ba0e89202254349d1b