net/ena: remove unused macro
Checks
Commit Message
This assert macro is not called anymore.
This also fixes an invalid reference to RTE_LOGTYPE_ERR that does not
exist.
Fixes: 3adcba9a8987 ("net/ena: update HAL to the newer version")
Fixes: 6f1c9df9e9cc ("net/ena: use dynamic log type for debug logging")
Cc: stable@dpdk.org
Signed-off-by: David Marchand <david.marchand@redhat.com>
---
drivers/net/ena/base/ena_plat_dpdk.h | 13 -------------
1 file changed, 13 deletions(-)
Comments
pt., 23 paź 2020 o 10:44 David Marchand <david.marchand@redhat.com> napisał(a):
>
> This assert macro is not called anymore.
> This also fixes an invalid reference to RTE_LOGTYPE_ERR that does not
> exist.
>
> Fixes: 3adcba9a8987 ("net/ena: update HAL to the newer version")
> Fixes: 6f1c9df9e9cc ("net/ena: use dynamic log type for debug logging")
> Cc: stable@dpdk.org
>
> Signed-off-by: David Marchand <david.marchand@redhat.com>
Acked-by: Michal Krawczyk <mk@semihalf.com>
> ---
> drivers/net/ena/base/ena_plat_dpdk.h | 13 -------------
> 1 file changed, 13 deletions(-)
>
> diff --git a/drivers/net/ena/base/ena_plat_dpdk.h b/drivers/net/ena/base/ena_plat_dpdk.h
> index ae4fd8f868..a6782f3732 100644
> --- a/drivers/net/ena/base/ena_plat_dpdk.h
> +++ b/drivers/net/ena/base/ena_plat_dpdk.h
> @@ -73,19 +73,6 @@ typedef uint64_t dma_addr_t;
> (rte_get_timer_cycles() * US_PER_S / rte_get_timer_hz())
>
> extern int ena_logtype_com;
> -#if RTE_LOG_DP_LEVEL >= RTE_LOG_DEBUG
> -#define ENA_ASSERT(cond, format, arg...) \
> - do { \
> - if (unlikely(!(cond))) { \
> - rte_log(RTE_LOGTYPE_ERR, ena_logtype_com, \
> - format, ##arg); \
> - rte_panic("line %d\tassert \"" #cond "\"" \
> - "failed\n", __LINE__); \
> - } \
> - } while (0)
> -#else
> -#define ENA_ASSERT(cond, format, arg...) do {} while (0)
> -#endif
>
> #define ENA_MAX_T(type, x, y) RTE_MAX((type)(x), (type)(y))
> #define ENA_MAX32(x, y) ENA_MAX_T(uint32_t, (x), (y))
> --
> 2.23.0
>
On 10/23/2020 1:56 PM, Michał Krawczyk wrote:
> pt., 23 paź 2020 o 10:44 David Marchand <david.marchand@redhat.com> napisał(a):
>>
>> This assert macro is not called anymore.
>> This also fixes an invalid reference to RTE_LOGTYPE_ERR that does not
>> exist.
>>
>> Fixes: 3adcba9a8987 ("net/ena: update HAL to the newer version")
>> Fixes: 6f1c9df9e9cc ("net/ena: use dynamic log type for debug logging")
>> Cc: stable@dpdk.org
>>
>> Signed-off-by: David Marchand <david.marchand@redhat.com>
> Acked-by: Michal Krawczyk <mk@semihalf.com>
>
Applied to dpdk-next-net/main, thanks.
@@ -73,19 +73,6 @@ typedef uint64_t dma_addr_t;
(rte_get_timer_cycles() * US_PER_S / rte_get_timer_hz())
extern int ena_logtype_com;
-#if RTE_LOG_DP_LEVEL >= RTE_LOG_DEBUG
-#define ENA_ASSERT(cond, format, arg...) \
- do { \
- if (unlikely(!(cond))) { \
- rte_log(RTE_LOGTYPE_ERR, ena_logtype_com, \
- format, ##arg); \
- rte_panic("line %d\tassert \"" #cond "\"" \
- "failed\n", __LINE__); \
- } \
- } while (0)
-#else
-#define ENA_ASSERT(cond, format, arg...) do {} while (0)
-#endif
#define ENA_MAX_T(type, x, y) RTE_MAX((type)(x), (type)(y))
#define ENA_MAX32(x, y) ENA_MAX_T(uint32_t, (x), (y))