| Message ID | 20230313103653.2753139-2-u.kleine-koenig@pengutronix.de (mailing list archive) |
|---|---|
| State | Changes Requested |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | net: freescale: Convert to platform remove callback returning void | expand |
| Context | Check | Description |
|---|---|---|
| netdev/series_format | success | Posting correctly formatted |
| netdev/tree_selection | success | Clearly marked for net-next |
| netdev/fixes_present | success | Fixes tag not required for -next series |
| netdev/header_inline | success | No static functions without inline keyword in header files |
| netdev/build_32bit | success | Errors and warnings before: 18 this patch: 18 |
| netdev/cc_maintainers | success | CCed 7 of 7 maintainers |
| netdev/build_clang | success | Errors and warnings before: 18 this patch: 18 |
| netdev/verify_signedoff | success | Signed-off-by tag matches author and committer |
| netdev/deprecated_api | success | None detected |
| netdev/check_selftest | success | No net selftest shell script |
| netdev/verify_fixes | success | No Fixes tag |
| netdev/build_allmodconfig_warn | success | Errors and warnings before: 18 this patch: 18 |
| netdev/checkpatch | success | total: 0 errors, 0 warnings, 0 checks, 16 lines checked |
| netdev/kdoc | success | Errors and warnings before: 0 this patch: 0 |
| netdev/source_inline | success | Was 0 now: 0 |
> -----Original Message----- > From: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> > Sent: 13 March 2023 12:37 > To: Madalin Bucur <madalin.bucur@nxp.com>; David S. Miller > <davem@davemloft.net>; Eric Dumazet <edumazet@google.com>; Jakub Kicinski > <kuba@kernel.org>; Paolo Abeni <pabeni@redhat.com>; Russell King > <linux@armlinux.org.uk> > Cc: netdev@vger.kernel.org; kernel@pengutronix.de > Subject: [PATCH net-next 1/9] net: dpaa: Improve error reporting > > Instead of the generic error message emitted by the driver core when a > remove callback returns an error code ("remove callback returned a > non-zero value. This will be ignored."), emit a message describing the > actual problem and return zero to suppress the generic message. > > Note that apart from suppressing the generic error message there are no > side effects by changing the return value to zero. This prepares > changing the remove callback to return void. > > Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> > --- > drivers/net/ethernet/freescale/dpaa/dpaa_eth.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c > b/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c > index 9318a2554056..97cad3750096 100644 > --- a/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c > +++ b/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c > @@ -3520,6 +3520,8 @@ static int dpaa_remove(struct platform_device *pdev) > phylink_destroy(priv->mac_dev->phylink); > > err = dpaa_fq_free(dev, &priv->dpaa_fq_list); > + if (err) > + dev_err(&pdev->dev, "Failed to free FQs on remove\n"); You have a bit before dev = &pdev->dev; so you can write just as well: + dev_err(dev, "Failed to free FQs on remove\n"); With or without this minor nit pick fixed, Acked-by: Madalin Bucur <madalin.bucur@oss.nxp.com> > > qman_delete_cgr_safe(&priv->ingress_cgr); > qman_release_cgrid(priv->ingress_cgr.cgrid); > @@ -3532,7 +3534,7 @@ static int dpaa_remove(struct platform_device *pdev) > > free_netdev(net_dev); > > - return err; > + return 0; > } > > static const struct platform_device_id dpaa_devtype[] = { > -- > 2.39.1
diff --git a/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c b/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c index 9318a2554056..97cad3750096 100644 --- a/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c +++ b/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c @@ -3520,6 +3520,8 @@ static int dpaa_remove(struct platform_device *pdev) phylink_destroy(priv->mac_dev->phylink); err = dpaa_fq_free(dev, &priv->dpaa_fq_list); + if (err) + dev_err(&pdev->dev, "Failed to free FQs on remove\n"); qman_delete_cgr_safe(&priv->ingress_cgr); qman_release_cgrid(priv->ingress_cgr.cgrid); @@ -3532,7 +3534,7 @@ static int dpaa_remove(struct platform_device *pdev) free_netdev(net_dev); - return err; + return 0; } static const struct platform_device_id dpaa_devtype[] = {
Instead of the generic error message emitted by the driver core when a remove callback returns an error code ("remove callback returned a non-zero value. This will be ignored."), emit a message describing the actual problem and return zero to suppress the generic message. Note that apart from suppressing the generic error message there are no side effects by changing the return value to zero. This prepares changing the remove callback to return void. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> --- drivers/net/ethernet/freescale/dpaa/dpaa_eth.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)