[dpdk-dev] [PATCH 11/13] drivers/bus: use log register macro

[Sachin Saxena (OSS)]

Acked-by: Sachin Saxena<sachin.saxena at oss.nxp.com>


On 17-Jun-20 12:00 PM, jerinj at marvell.com wrote:
> From: Jerin Jacob <jerinj at marvell.com>
>
> Use log register macro to avoid the code duplication
> in the log registration process.
>
> Signed-off-by: Jerin Jacob <jerinj at marvell.com>
> ---
>   drivers/bus/dpaa/dpaa_bus.c      | 10 +---------
>   drivers/bus/fslmc/fslmc_bus.c    | 11 +----------
>   drivers/bus/ifpga/ifpga_bus.c    |  9 +--------
>   drivers/bus/vdev/vdev.c          | 10 +---------
>   drivers/bus/vmbus/vmbus_common.c |  9 +--------
>   5 files changed, 5 insertions(+), 44 deletions(-)
>
> diff --git a/drivers/bus/dpaa/dpaa_bus.c b/drivers/bus/dpaa/dpaa_bus.c
> index d53fe6083..0d8b13e5f 100644
> --- a/drivers/bus/dpaa/dpaa_bus.c
> +++ b/drivers/bus/dpaa/dpaa_bus.c
> @@ -42,8 +42,6 @@
>   #include <fsl_bman.h>
>   #include <netcfg.h>
>   
> -int dpaa_logtype_bus;
> -
>   static struct rte_dpaa_bus rte_dpaa_bus;
>   struct netcfg_info *dpaa_netcfg;
>   
> @@ -749,10 +747,4 @@ static struct rte_dpaa_bus rte_dpaa_bus = {
>   };
>   
>   RTE_REGISTER_BUS(FSL_DPAA_BUS_NAME, rte_dpaa_bus.bus);
> -
> -RTE_INIT(dpaa_init_log)
> -{
> -	dpaa_logtype_bus = rte_log_register("bus.dpaa");
> -	if (dpaa_logtype_bus >= 0)
> -		rte_log_set_level(dpaa_logtype_bus, RTE_LOG_NOTICE);
> -}
> +RTE_LOG_REGISTER(dpaa_logtype_bus, bus.dpaa, NOTICE);
> diff --git a/drivers/bus/fslmc/fslmc_bus.c b/drivers/bus/fslmc/fslmc_bus.c
> index afbd82e8d..d9f403bd9 100644
> --- a/drivers/bus/fslmc/fslmc_bus.c
> +++ b/drivers/bus/fslmc/fslmc_bus.c
> @@ -21,8 +21,6 @@
>   
>   #include <dpaax_iova_table.h>
>   
> -int dpaa2_logtype_bus;
> -
>   #define VFIO_IOMMU_GROUP_PATH "/sys/kernel/iommu_groups"
>   #define FSLMC_BUS_NAME	fslmc
>   
> @@ -649,11 +647,4 @@ struct rte_fslmc_bus rte_fslmc_bus = {
>   };
>   
>   RTE_REGISTER_BUS(FSLMC_BUS_NAME, rte_fslmc_bus.bus);
> -
> -RTE_INIT(fslmc_init_log)
> -{
> -	/* Bus level logs */
> -	dpaa2_logtype_bus = rte_log_register("bus.fslmc");
> -	if (dpaa2_logtype_bus >= 0)
> -		rte_log_set_level(dpaa2_logtype_bus, RTE_LOG_NOTICE);
> -}
> +RTE_LOG_REGISTER(dpaa2_logtype_bus, bus.fslmc, NOTICE);
> diff --git a/drivers/bus/ifpga/ifpga_bus.c b/drivers/bus/ifpga/ifpga_bus.c
> index addbc3e86..103915d43 100644
> --- a/drivers/bus/ifpga/ifpga_bus.c
> +++ b/drivers/bus/ifpga/ifpga_bus.c
> @@ -32,7 +32,6 @@
>   #include "ifpga_logs.h"
>   #include "ifpga_common.h"
>   
> -int ifpga_bus_logtype;
>   
>   /* Forward declaration to access Intel FPGA bus
>    * on which iFPGA devices are connected
> @@ -474,10 +473,4 @@ static struct rte_bus rte_ifpga_bus = {
>   };
>   
>   RTE_REGISTER_BUS(IFPGA_BUS_NAME, rte_ifpga_bus);
> -
> -RTE_INIT(ifpga_init_log)
> -{
> -	ifpga_bus_logtype = rte_log_register("bus.ifpga");
> -	if (ifpga_bus_logtype >= 0)
> -		rte_log_set_level(ifpga_bus_logtype, RTE_LOG_NOTICE);
> -}
> +RTE_LOG_REGISTER(ifpga_bus_logtype, bus.ifpga, NOTICE);
> diff --git a/drivers/bus/vdev/vdev.c b/drivers/bus/vdev/vdev.c
> index a89ea2353..d746149a2 100644
> --- a/drivers/bus/vdev/vdev.c
> +++ b/drivers/bus/vdev/vdev.c
> @@ -27,8 +27,6 @@
>   
>   #define VDEV_MP_KEY	"bus_vdev_mp"
>   
> -int vdev_logtype_bus;
> -
>   /* Forward declare to access virtual bus name */
>   static struct rte_bus rte_vdev_bus;
>   
> @@ -557,10 +555,4 @@ static struct rte_bus rte_vdev_bus = {
>   };
>   
>   RTE_REGISTER_BUS(vdev, rte_vdev_bus);
> -
> -RTE_INIT(vdev_init_log)
> -{
> -	vdev_logtype_bus = rte_log_register("bus.vdev");
> -	if (vdev_logtype_bus >= 0)
> -		rte_log_set_level(vdev_logtype_bus, RTE_LOG_NOTICE);
> -}
> +RTE_LOG_REGISTER(vdev_logtype_bus, bus.vdev, NOTICE);
> diff --git a/drivers/bus/vmbus/vmbus_common.c b/drivers/bus/vmbus/vmbus_common.c
> index 3adef01c9..4c9ac33ac 100644
> --- a/drivers/bus/vmbus/vmbus_common.c
> +++ b/drivers/bus/vmbus/vmbus_common.c
> @@ -22,7 +22,6 @@
>   
>   #include "private.h"
>   
> -int vmbus_logtype_bus;
>   extern struct rte_vmbus_bus rte_vmbus_bus;
>   
>   /* map a particular resource from a file */
> @@ -298,10 +297,4 @@ struct rte_vmbus_bus rte_vmbus_bus = {
>   };
>   
>   RTE_REGISTER_BUS(vmbus, rte_vmbus_bus.bus);
> -
> -RTE_INIT(vmbus_init_log)
> -{
> -	vmbus_logtype_bus = rte_log_register("bus.vmbus");
> -	if (vmbus_logtype_bus >= 0)
> -		rte_log_set_level(vmbus_logtype_bus, RTE_LOG_NOTICE);
> -}
> +RTE_LOG_REGISTER(vmbus_logtype_bus, bus.vmbus, NOTICE);