* [PATCH] fslmc: remove unneeded strdup
2019-02-06 22:04 [PATCH] fslmc: don't log error for other devices Stephen Hemminger
@ 2019-02-06 22:10 ` Stephen Hemminger
2019-02-25 15:23 ` [dpdk-stable] [PATCH] fslmc: don't log error for other devices Thomas Monjalon
1 sibling, 0 replies; 3+ messages in thread
From: Stephen Hemminger @ 2019-02-06 22:10 UTC (permalink / raw)
To: dev
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
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [dpdk-stable] [PATCH] fslmc: don't log error for other devices
2019-02-06 22:04 [PATCH] fslmc: don't log error for other devices Stephen Hemminger
2019-02-06 22:10 ` [PATCH] fslmc: remove unneeded strdup Stephen Hemminger
@ 2019-02-25 15:23 ` Thomas Monjalon
1 sibling, 0 replies; 3+ messages in thread
From: Thomas Monjalon @ 2019-02-25 15:23 UTC (permalink / raw)
To: Stephen Hemminger; +Cc: stable, dev, shreyansh.jain, hemant.agrawal
+Cc maintainers
06/02/2019 23:04, Stephen Hemminger:
> When fslmc is built as part of a general distribution, the
> bus code will log errors when other devices are present.
>
> This could confuse users it is not an error.
>
> Fixes: 50245be05d1a ("bus/fslmc: support device blacklisting")
> Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
> ---
> drivers/bus/fslmc/fslmc_bus.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/bus/fslmc/fslmc_bus.c b/drivers/bus/fslmc/fslmc_bus.c
> index 44c0827ced0b..a2525780cd08 100644
> --- a/drivers/bus/fslmc/fslmc_bus.c
> +++ b/drivers/bus/fslmc/fslmc_bus.c
> @@ -249,7 +249,7 @@ rte_fslmc_parse(const char *name, void *addr)
> strncmp("dpmcp", t_ptr, 5) &&
> strncmp("dpdmai", t_ptr, 6) &&
> strncmp("dpdmux", t_ptr, 6)) {
> - DPAA2_BUS_ERR("Unknown or unsupported device");
> + DPAA2_BUS_DEBUG("Unknown or unsupported device (%s)", name);
> goto err_out;
> }
>
>
^ permalink raw reply [flat|nested] 3+ messages in thread