From: Stephen Hemminger <stephen@networkplumber.org>
To: dev@dpdk.org
Subject: [dpdk-dev] [PATCH] fslmc: remove unneeded strdup
Date: Wed, 6 Feb 2019 14:10:15 -0800 [thread overview]
Message-ID: <20190206141015.4adedb33@hermes.lan> (raw)
In-Reply-To: <20190206220414.9450-1-stephen@networkplumber.org>
The fslmc bus code was duplicating the device name and
doing extra initialization. The code can be simplified
to just use the device name directly.
Compile tested only; do not have this hardware.
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
---
This patch assumes the previous log fix.
Since it is only a cleanup does not need to go to stable.
drivers/bus/fslmc/fslmc_bus.c | 38 +++++++++++------------------------
1 file changed, 12 insertions(+), 26 deletions(-)
diff --git a/drivers/bus/fslmc/fslmc_bus.c b/drivers/bus/fslmc/fslmc_bus.c
index a2525780cd08..eaa39a2093e0 100644
--- a/drivers/bus/fslmc/fslmc_bus.c
+++ b/drivers/bus/fslmc/fslmc_bus.c
@@ -229,49 +229,35 @@ static int
rte_fslmc_parse(const char *name, void *addr)
{
uint16_t dev_id;
- char *t_ptr = NULL, *dname = NULL;
+ char *t_ptr;
/* 'name' is expected to contain name of device, for example, dpio.1,
* dpni.2, etc.
*/
-
- dname = strdup(name);
- if (!dname)
- return -EINVAL;
- t_ptr = dname;
-
- if (strncmp("dpni", t_ptr, 4) &&
- strncmp("dpseci", t_ptr, 6) &&
- strncmp("dpcon", t_ptr, 5) &&
- strncmp("dpbp", t_ptr, 4) &&
- strncmp("dpio", t_ptr, 4) &&
- strncmp("dpci", t_ptr, 4) &&
- strncmp("dpmcp", t_ptr, 5) &&
- strncmp("dpdmai", t_ptr, 6) &&
- strncmp("dpdmux", t_ptr, 6)) {
+ if (strncmp("dpni", name, 4) &&
+ strncmp("dpseci", name, 6) &&
+ strncmp("dpcon", name, 5) &&
+ strncmp("dpbp", name, 4) &&
+ strncmp("dpio", name, 4) &&
+ strncmp("dpci", name, 4) &&
+ strncmp("dpmcp", name, 5) &&
+ strncmp("dpdmai", name, 6) &&
+ strncmp("dpdmux", name, 6)) {
DPAA2_BUS_DEBUG("Unknown or unsupported device (%s)", name);
goto err_out;
}
t_ptr = strchr(name, '.');
- if (!t_ptr) {
- DPAA2_BUS_ERR("Incorrect device string observed (%s)", t_ptr);
- goto err_out;
- }
-
- t_ptr = (char *)(t_ptr + 1);
- if (sscanf(t_ptr, "%hu", &dev_id) <= 0) {
- DPAA2_BUS_ERR("Incorrect device string observed (%s)", t_ptr);
+ if (!t_ptr || sscanf(t_ptr + 1, "%hu", &dev_id) != 1) {
+ DPAA2_BUS_ERR("Missing device id in device name (%s)", name);
goto err_out;
}
- free(dname);
if (addr)
strcpy(addr, name);
return 0;
err_out:
- free(dname);
return -EINVAL;
}
--
2.20.1
next prev parent reply other threads:[~2019-02-06 22:10 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-06 22:04 [dpdk-dev] [PATCH] fslmc: don't log error for other devices Stephen Hemminger
2019-02-06 22:10 ` Stephen Hemminger [this message]
2019-02-25 15:23 ` [dpdk-dev] [dpdk-stable] " Thomas Monjalon
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=20190206141015.4adedb33@hermes.lan \
--to=stephen@networkplumber.org \
--cc=dev@dpdk.org \
/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).