From: Markus Elfring <Markus.Elfring@web.de>
To: netdev@vger.kernel.org, "David S. Miller" <davem@davemloft.net>,
Madalin Bucur <madalin.bucur@nxp.com>
Cc: LKML <linux-kernel@vger.kernel.org>,
kernel-janitors@vger.kernel.org, Wen Yang <wen.yang99@zte.com.cn>
Subject: [PATCH 1/3] fsl/fman: Add missing put_device() calls in mac_probe()
Date: Sat, 9 Nov 2019 10:00:27 +0100 [thread overview]
Message-ID: <63d9c06f-7cb8-1c44-1666-12d31f937a31@web.de> (raw)
In-Reply-To: <132e8369-c4da-249f-76b8-834e394dc6d5@web.de>
From: Markus Elfring <elfring@users.sourceforge.net>
Date: Sat, 9 Nov 2019 08:14:35 +0100
A coccicheck run provided information like the following.
drivers/net/ethernet/freescale/fman/mac.c:874:1-7: ERROR: missing put_device;
call of_find_device_by_node on line 659, but without a corresponding
object release within this function.
drivers/net/ethernet/freescale/fman/mac.c:874:1-7: ERROR: missing put_device;
call of_find_device_by_node on line 760, but without a corresponding
object release within this function.
Generated by: scripts/coccinelle/free/put_device.cocci
Thus adjust jump targets to fix the exception handling for this
function implementation.
Fixes: 3933961682a30ae7d405cda344c040a129fea422 ("fsl/fman: Add FMan MAC driver")
Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
drivers/net/ethernet/freescale/fman/mac.c | 28 ++++++++++++++---------
1 file changed, 17 insertions(+), 11 deletions(-)
diff --git a/drivers/net/ethernet/freescale/fman/mac.c b/drivers/net/ethernet/freescale/fman/mac.c
index f0806ace1ae2..e0680257532c 100644
--- a/drivers/net/ethernet/freescale/fman/mac.c
+++ b/drivers/net/ethernet/freescale/fman/mac.c
@@ -668,7 +668,7 @@ static int mac_probe(struct platform_device *_of_dev)
if (err) {
dev_err(dev, "failed to read cell-index for %pOF\n", dev_node);
err = -EINVAL;
- goto _return_of_node_put;
+ goto _put_device;
}
/* cell-index 0 => FMan id 1 */
fman_id = (u8)(val + 1);
@@ -677,7 +677,7 @@ static int mac_probe(struct platform_device *_of_dev)
if (!priv->fman) {
dev_err(dev, "fman_bind(%pOF) failed\n", dev_node);
err = -ENODEV;
- goto _return_of_node_put;
+ goto _put_device;
}
of_node_put(dev_node);
@@ -687,7 +687,7 @@ static int mac_probe(struct platform_device *_of_dev)
if (err < 0) {
dev_err(dev, "of_address_to_resource(%pOF) = %d\n",
mac_node, err);
- goto _return_of_get_parent;
+ goto _put_parent_device;
}
mac_dev->res = __devm_request_region(dev,
@@ -697,7 +697,7 @@ static int mac_probe(struct platform_device *_of_dev)
if (!mac_dev->res) {
dev_err(dev, "__devm_request_mem_region(mac) failed\n");
err = -EBUSY;
- goto _return_of_get_parent;
+ goto _put_parent_device;
}
priv->vaddr = devm_ioremap(dev, mac_dev->res->start,
@@ -705,12 +705,12 @@ static int mac_probe(struct platform_device *_of_dev)
if (!priv->vaddr) {
dev_err(dev, "devm_ioremap() failed\n");
err = -EIO;
- goto _return_of_get_parent;
+ goto _put_parent_device;
}
if (!of_device_is_available(mac_node)) {
err = -ENODEV;
- goto _return_of_get_parent;
+ goto _put_parent_device;
}
/* Get the cell-index */
@@ -718,7 +718,7 @@ static int mac_probe(struct platform_device *_of_dev)
if (err) {
dev_err(dev, "failed to read cell-index for %pOF\n", mac_node);
err = -EINVAL;
- goto _return_of_get_parent;
+ goto _put_parent_device;
}
priv->cell_index = (u8)val;
@@ -727,7 +727,7 @@ static int mac_probe(struct platform_device *_of_dev)
if (IS_ERR(mac_addr)) {
dev_err(dev, "of_get_mac_address(%pOF) failed\n", mac_node);
err = -EINVAL;
- goto _return_of_get_parent;
+ goto _put_parent_device;
}
ether_addr_copy(mac_dev->addr, mac_addr);
@@ -737,14 +737,14 @@ static int mac_probe(struct platform_device *_of_dev)
dev_err(dev, "of_count_phandle_with_args(%pOF, fsl,fman-ports) failed\n",
mac_node);
err = nph;
- goto _return_of_get_parent;
+ goto _put_parent_device;
}
if (nph != ARRAY_SIZE(mac_dev->port)) {
dev_err(dev, "Not supported number of fman-ports handles of mac node %pOF from device tree\n",
mac_node);
err = -EINVAL;
- goto _return_of_get_parent;
+ goto _put_parent_device;
}
for (i = 0; i < ARRAY_SIZE(mac_dev->port); i++) {
@@ -770,7 +770,7 @@ static int mac_probe(struct platform_device *_of_dev)
dev_err(dev, "dev_get_drvdata(%pOF) failed\n",
dev_node);
err = -EINVAL;
- goto _return_of_node_put;
+ goto _put_device;
}
of_node_put(dev_node);
}
@@ -866,6 +866,12 @@ static int mac_probe(struct platform_device *_of_dev)
goto _return;
+_put_parent_device:
+ put_device(&of_dev->dev);
+ goto _return_of_get_parent;
+
+_put_device:
+ put_device(&of_dev->dev);
_return_of_node_put:
of_node_put(dev_node);
_return_of_get_parent:
--
2.24.0
next prev parent reply other threads:[~2019-11-09 9:00 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-09 8:55 [PATCH 0/3] FMan MAC: Improve exception handling in mac_probe() Markus Elfring
2019-11-09 9:00 ` Markus Elfring [this message]
2019-11-10 9:15 ` [PATCH 1/3] fsl/fman: Add missing put_device() calls " Markus Elfring
2019-11-09 9:03 ` [PATCH 2/3] fsl/fman: Use common error handling code " Markus Elfring
2019-11-09 9:03 ` Markus Elfring
2019-11-09 9:06 ` [PATCH 3/3] fsl/fman: Return directly after a failed devm_kzalloc() " Markus Elfring
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=63d9c06f-7cb8-1c44-1666-12d31f937a31@web.de \
--to=markus.elfring@web.de \
--cc=davem@davemloft.net \
--cc=kernel-janitors@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=madalin.bucur@nxp.com \
--cc=netdev@vger.kernel.org \
--cc=wen.yang99@zte.com.cn \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).