From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-eopbgr70073.outbound.protection.outlook.com [40.107.7.73]) by dpdk.org (Postfix) with ESMTP id 28FBC2BA3 for ; Thu, 30 Aug 2018 07:35:22 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=m+uMLbUUUSyFei7jYChBImjURMYvSn5DZY29HAxXKBI=; b=nO1e2C6csxKEr+Sgf4F6geWfnF/4Nq4mlOTSPrX++YhBQ5IGwEkPI/y1Y4AM96u6Cp7aCBiUCqvN/Ujfua8XfrcrnMltJkV+dzz27m4/YH7oTRzBIMeCg1Ajne5z/VyIu6jPAA26QoOrmBgko0fsDmGW49JxcbzI4OKhHG5mLvI= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=hemant.agrawal@nxp.com; Received: from bf-netperf1.ap.freescale.net (14.143.30.134) by VI1PR0401MB2544.eurprd04.prod.outlook.com (2603:10a6:800:56::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1080.17; Thu, 30 Aug 2018 05:35:19 +0000 From: Hemant Agrawal To: dev@dpdk.org Cc: jerin.jacob@caviumnetworks.com, nipun.gupta@nxp.com Date: Thu, 30 Aug 2018 11:03:15 +0530 Message-Id: <1535607196-26782-1-git-send-email-hemant.agrawal@nxp.com> X-Mailer: git-send-email 2.7.4 MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [14.143.30.134] X-ClientProxiedBy: BM1PR01CA0082.INDPRD01.PROD.OUTLOOK.COM (2603:1096:b00:1::22) To VI1PR0401MB2544.eurprd04.prod.outlook.com (2603:10a6:800:56::22) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 743ffe5c-22d0-44c7-7d57-08d60e3a6022 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989137)(4534165)(7168020)(4627221)(201703031133081)(201702281549075)(8990107)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:VI1PR0401MB2544; X-Microsoft-Exchange-Diagnostics: 1; VI1PR0401MB2544; 3:j7vC8QCAZ7ZzxBNm54xqL1CJF53BSyEGzoxNb+BqJXqxESfii+faL5xxQc+hyGMsEZ3oHgyt32K2mG7Ucq3OqYgBZ4VIpYOJ0fuXEsCJaPnn2HE24UuxBIj1U+19KKWo6fFBDhjV1CZN20w4h5ABltHPaO7NXL9yBdi0z9POIp5Tlb9aMSmaLDlI4nyUjK3ErW5DcY4vJT4nRHrYGbv0G/yubicLVLTFd0DkoCQM8wiFLTDUwwXmJ1+bL2XNs3w0; 25:F1PkkWkOUiQL8mGTgXUHZkOlMjV0uIjLTrQzTUqpPNuHqbA+WnWoMwWtcnqV0MagVwwdUsEa7QRfhHDiS/rrNrxmA4O+7poayakC7Cfm95Roa5kxbyNmLYtsWCY5PuYBrfFoEQycFMecw9A164V22elyKvtd2m38oVe/C1sc8ijljYXvl5ex0oIM1jZFYn/73Z/hbo+1tBdim7M2asr69JxutcDBmeOp1ndyvozIPZiI33hEmKHmtg2szm3GfQ/wGn89+OV1ZY0tQxaa9DO/RkB3u9KRG56tgSwHvL6VMIDP+JlMwOltisBkevt9R65ngZNxeSWMJB5d46soE91TsA==; 31:8SnhRHkkIfgoTLY4fvE4jgyCozE0TYuueRZo43hSlfalEjml6CrjP5/HBgR24B2quTk+X/Rn4QvDHkQBnr/DvWlz06714dQOLJLxnS4ro/0pNhHUDr5zYwyN5hByD8VqiSgm5cq9MAvF0TKLxfztgtP1rouQl18/gVVV1iOZ8nBRbyT6l3Zque4VAanJ7Vd63ytTXd6lOfFR4XRd7rtHk7ztzZmbnHs/1vacbgdZVTE= X-MS-TrafficTypeDiagnostic: VI1PR0401MB2544: X-Microsoft-Exchange-Diagnostics: 1; VI1PR0401MB2544; 20:a/Ln+Gs4uCgBIfCLvcKf9lMd7XvyUQ4HZQUizTScPyhtBtXXGCZ3X24WAyaycSJHR9XsW3LSZiFNNQEbfzfbSvHgp8MU2zolKxr2JUkPX3m68NVdxOp09gjWbpHDj5TurzMmk8u6jv8X2ncan9VMtrhBfUwf5jJwfT/RVuXBnYB5flT2DAeSmsomXL3s0u6meKZ+Xf9M2Royr9dlrrmmgAManCWKcdJaAQOWeLi8mIDxNm6lePIkYgsHDmMCCVao0Ch9tlzpkuUW/M+ADWUxZJz8W/m3jvzNfpprLXAIgjivi7VCyyYGKnDdC30GZB3I7QHTrjKW9IAFtYq/Y2+50a9D2K0IGpq+1Sj8r05B+P0udaujaymGkYnG9QRz4Y8e3YTDpyacUKQ1FflViox1SwesrmE6isjeZ+1CVAk2gfDLL6b4MBCypaBR22Z99KHc8HdAXQ269RGpQ+P6EbGgyY5HAiBlXO/vfbJcFzL8Txqa1DQ6SW8v/KmXUVlevK9f; 4:t+vIjW4KuuEFlsznBaF9MgjvSFWpgUCeXlGs5iCfyLaKo4JzD63fBCHL/mO2WUCMijU/eiYEoGcE+fIsJsu1kSNbOFZbv6z318F9WhSpJfn8mp/1Bi0AUMZQmpCnGk1tfZpVD9563006trtUkhQfZrpw3Tbbcm5DNcMdfBwNmiQ+AUQ8O8dTBVFRm28xDXykSo1dPcYWAiEyiAojca+YRPuIxKlHHkUCHT4Jv3D6ncKNlsfcY4IolVQyKSICVOYMNapQHK1n00tcOiKMdfCMJtulsDE/26DB/vyDNWoJhlQirYe3cPr0l1FhQemf1f5+ X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(823301075)(3231311)(944501410)(52105095)(3002001)(93006095)(93001095)(10201501046)(6055026)(149027)(150027)(6041310)(20161123562045)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123564045)(201708071742011)(7699016); SRVR:VI1PR0401MB2544; BCL:0; PCL:0; RULEID:; SRVR:VI1PR0401MB2544; X-Forefront-PRVS: 07807C55DC X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(376002)(366004)(39860400002)(346002)(396003)(136003)(199004)(189003)(4326008)(8936002)(5009440100003)(6916009)(305945005)(3846002)(186003)(48376002)(16526019)(6666003)(478600001)(2361001)(25786009)(105586002)(68736007)(7736002)(47776003)(44832011)(50226002)(2351001)(106356001)(6116002)(66066001)(97736004)(36756003)(16586007)(51416003)(8676002)(6512007)(55236004)(81166006)(81156014)(386003)(6506007)(5024004)(316002)(14444005)(956004)(50466002)(26005)(5660300001)(2906002)(2616005)(6486002)(86362001)(53936002)(52116002)(486006)(476003)(110426005); DIR:OUT; SFP:1101; SCL:1; SRVR:VI1PR0401MB2544; H:bf-netperf1.ap.freescale.net; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; Received-SPF: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; VI1PR0401MB2544; 23:b7YZ+TAFBJWdQ8QNs70B/Sa4Vk2/ZA0l30UsX5B?= =?us-ascii?Q?5aCFAW6+V0b+Fx+nl4/mcc1F8BzJg1WpNjbzblDed0zCVd1h5fNnj6tR3d7z?= =?us-ascii?Q?ySmyZEgfVP1KS2rszDa6WpDEjZREF20nSZLt5DRnTHkNgzysMA9WBBxou7g1?= =?us-ascii?Q?PvVHxlsPhjqPR4I+5E184zIJtpKZOUoTnJn6Fw7QXjFBfXDoWn1vTra/PtaV?= =?us-ascii?Q?tGRx97EuM0byJ6kCXTHMOq/AbtI90OHzVnSuPWLXpb5+PO6hHAgfMzr355i1?= =?us-ascii?Q?efu0ht2qj4974jcKoKWvtU1RYa517h+8eI6CLOXX4oxPk1i4fYtZgH8DaTFR?= =?us-ascii?Q?CwhsmCYxDBxQUKQxuy0XUHO+4nDOS9zvIb9NctFqLPxsC5YHBJvLjYP4g+O0?= =?us-ascii?Q?0N+jqgTdIz8VemjvccyVVbIBgiGTNEhmUSNj3byjIPWNfcxxj8t2kPJw/LuC?= =?us-ascii?Q?p/o/BWVyNUsnbP1kUQambvxeScGpoddRf82v0h4m/TSXoJj78LyIGCkvZr35?= =?us-ascii?Q?XaxzpgiHFPxCwHuPu5oAErF3xhs9xgwqfgqSCuej6Ot5TMbSHWSIBu6Q3g9o?= =?us-ascii?Q?GPGBhVP2UWwhvcw7cKiVQJLDm+E2g1ybCZJo8jtXwheKWZ6HPS4wcRDWlpJh?= =?us-ascii?Q?NgsFUcVodXykeQT0sE69VVJmdJYaIHwoYeJGtBbYIlClCu5Bd6joO0GLNwW2?= =?us-ascii?Q?W2KFibJF1K/KvbXZEosAouKcuMQrD8YlSCiPLje1tYdKbpdRqR7vg/kyk7Ct?= =?us-ascii?Q?/5/iOt4SHe0JggTO9fuCmt+xEYu3V5xgjWmZQOAqgvQ3e2yx1/Cz/1iRswDn?= =?us-ascii?Q?DqsZxD/z0I0YZphBP76UQF4RkoYXJZsZQMImZKVpXSHjlnAmqEniaDMYxNhn?= =?us-ascii?Q?lUL54VMr9vNf/RoF+7SBf7KWuYC2QUI1n3rHmmFohXYUEpY6LiHdGz9WzmDJ?= =?us-ascii?Q?aL88ICzmIFzEQsvfjaN8P7UZb5jJYjgd7wrzWj9DrHxqMaYBhf48lpxOg0o8?= =?us-ascii?Q?qRjq0Nz3xV3xfGKvf8Gcf7x2IX8w2CxMMJZAZfKz8OOmNeKpoh5QwNV4VxFq?= =?us-ascii?Q?8O+2rfdBQdAVRwR1nPbLTs3+2YqNCCrtLrSW9gBDWePQy2BqGXWv+kbRRUPn?= =?us-ascii?Q?FVeKaMjJkTVeoh3X2xFyAWGvQJFr3P5W48/A0EznhPaAvENivASrLME77uuf?= =?us-ascii?Q?Hv0vKlijoozSGHncMnImxtbezf03Pm81Stktlu7N022P1eEJPnEtVCl25DV5?= =?us-ascii?Q?qyYingtjQBsLwX3/WFIRGQ+z4Jlb6LW9IiuH3ckYnde+bZfQ7Ygnc/69qgUW?= =?us-ascii?Q?9aA=3D=3D?= X-Microsoft-Antispam-Message-Info: rhqd2P48Mh3XFoUTpI0z1n0K7t45NU6WoSFZA1JupJBw5ygZxSyLq3UWG02YdNlubp2QaCkKx8RqaLeTnw7otVww1Yz9wjvLbso/QorQbrNDGgmiEEs105dpvhHWZjCSyVe/+A80u7WKTRQpizU6oviRX9YNl5RqS5gwNA209St9G/aDQ6cGp+PSYknMearggM/QXSlz7YEvhm55++tvwy/6whcXCZfQPgUScAUULn9HZw4wwzF/ghwtFwL/OG+TA+0y0CefgWkgt02atRUiSdxBP9ZhvX/HEqs3yM1ou2mecsiL63cFI+m9FTYdVpdBNzABo1iZafUy+Si23Gu+BPzOpXY7kf25oacv2jP6mG8= X-Microsoft-Exchange-Diagnostics: 1; VI1PR0401MB2544; 6:dqzhGY0QJOhheVNqmL9wrWe1cgcyuk42hwFnTlZMjK51DFZY2xgXFh16GROaC4RXXVC6B/sgangxTZqg5Cr62qbKxOF77acKyGz6D7Qfjkr6P3AHc/BcuZBC0rdftzJBhKshForOrpQ2llSRuhuOwa1z27siVXcJ94/9Al251MmkjwVHjGxHI37q5cFncZER4Voafupqk25Aw9XL43d4UhtiqtFWapWzUgXkKf1g4bgbfNnX+UVx9VVf5dEY7cBad/oCoxIP+167Pr0Fecj4fblh1iusmez7kOHaqYGJ3eupT3RotcSBnWGSxapcn/B5bGwi1MZ+Axpi+aCAHQn8N/4j72i0WaaytkG0FM3NZGZsxTQOmJcqNeo1Dumpnj8okVmjOfmqC6+4bkmfeG53umtyaXZItp0ir0468XQ8abrfPsnG9zaYELkuSexEobEP3YgsEbzkWXJoKAyQRN/wNg==; 5:j9gpJjxrjesUKlArAoESTGLSztnwR1LESmlwPbk5BbpSX0g6HLi1sLIHuML1W8cDa3g5OtWsbIKQV/74OfwKSn7dhYP4IFFp1S/A36eUgfsCZMCSBp4/iyC/kU/Iv7bIVDrovlUQVGLzTbOHC+dGvJfWwgjhwLWVgdz7gfBEdok=; 7:M33wSq/3CfgeNxIF9BGjaU+lGZUDY3w0ePl/4Uo5WInzZg91Ys3moBRDVC94ePX5Zzdk+is/Z5Cuup4LtwpCUrxk0/WZq3aLIWsdJzAIwfAyW4LDUo+o79emI46jwj+lE/EbMHYUEHQJKFjn5EVC9NXjPuqeartNdJig/JshJ8ZnCHdrpW9rGGSceI56sqrcA/UnWZ5i3KtAFBgVybdJUb9pzErbtZyq6GvpaUkmHiSIeHIxvwK9Bb5WOn0x6A8l SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Aug 2018 05:35:19.5702 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 743ffe5c-22d0-44c7-7d57-08d60e3a6022 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0401MB2544 Subject: [dpdk-dev] [PATCH 1/2] event/dpaa: remove duplicate log macros X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 30 Aug 2018 05:35:22 -0000 align and cleanup the debug log prints Signed-off-by: Hemant Agrawal --- drivers/event/dpaa/dpaa_eventdev.c | 58 +++++++++++++++++++------------------- drivers/event/dpaa/dpaa_eventdev.h | 7 ----- 2 files changed, 29 insertions(+), 36 deletions(-) diff --git a/drivers/event/dpaa/dpaa_eventdev.c b/drivers/event/dpaa/dpaa_eventdev.c index 5443ef5..9ddaf30 100644 --- a/drivers/event/dpaa/dpaa_eventdev.c +++ b/drivers/event/dpaa/dpaa_eventdev.c @@ -49,7 +49,7 @@ dpaa_event_dequeue_timeout_ticks(struct rte_eventdev *dev, uint64_t ns, { uint64_t cycles_per_second; - EVENTDEV_DRV_FUNC_TRACE(); + EVENTDEV_INIT_FUNC_TRACE(); RTE_SET_USED(dev); @@ -175,7 +175,7 @@ static void dpaa_event_dev_info_get(struct rte_eventdev *dev, struct rte_event_dev_info *dev_info) { - EVENTDEV_DRV_FUNC_TRACE(); + EVENTDEV_INIT_FUNC_TRACE(); RTE_SET_USED(dev); dev_info->driver_name = "event_dpaa"; @@ -220,8 +220,7 @@ dpaa_event_dev_configure(const struct rte_eventdev *dev) int ret, i; uint32_t *ch_id; - EVENTDEV_DRV_FUNC_TRACE(); - + EVENTDEV_INIT_FUNC_TRACE(); priv->dequeue_timeout_ns = conf->dequeue_timeout_ns; priv->nb_events_limit = conf->nb_events_limit; priv->nb_event_queues = conf->nb_event_queues; @@ -244,13 +243,14 @@ dpaa_event_dev_configure(const struct rte_eventdev *dev) sizeof(uint32_t) * priv->nb_event_queues, RTE_CACHE_LINE_SIZE); if (ch_id == NULL) { - EVENTDEV_DRV_ERR("Fail to allocate memory for dpaa channels\n"); + DPAA_EVENTDEV_ERR("Fail to allocate memory for dpaa channels\n"); return -ENOMEM; } /* Create requested event queues within the given event device */ ret = qman_alloc_pool_range(ch_id, priv->nb_event_queues, 1, 0); if (ret < 0) { - EVENTDEV_DRV_ERR("Failed to create internal channel\n"); + DPAA_EVENTDEV_ERR("qman_alloc_pool_range %u, err =%d\n", + priv->nb_event_queues, ret); rte_free(ch_id); return ret; } @@ -283,7 +283,7 @@ dpaa_event_dev_configure(const struct rte_eventdev *dev) * can be created equals to number of lcore. */ rte_free(ch_id); - EVENTDEV_DRV_LOG("Configured eventdev devid=%d", dev->data->dev_id); + DPAA_EVENTDEV_INFO("Configured eventdev devid=%d", dev->data->dev_id); return 0; } @@ -291,7 +291,7 @@ dpaa_event_dev_configure(const struct rte_eventdev *dev) static int dpaa_event_dev_start(struct rte_eventdev *dev) { - EVENTDEV_DRV_FUNC_TRACE(); + EVENTDEV_INIT_FUNC_TRACE(); RTE_SET_USED(dev); return 0; @@ -300,14 +300,14 @@ dpaa_event_dev_start(struct rte_eventdev *dev) static void dpaa_event_dev_stop(struct rte_eventdev *dev) { - EVENTDEV_DRV_FUNC_TRACE(); + EVENTDEV_INIT_FUNC_TRACE(); RTE_SET_USED(dev); } static int dpaa_event_dev_close(struct rte_eventdev *dev) { - EVENTDEV_DRV_FUNC_TRACE(); + EVENTDEV_INIT_FUNC_TRACE(); RTE_SET_USED(dev); return 0; @@ -317,7 +317,7 @@ static void dpaa_event_queue_def_conf(struct rte_eventdev *dev, uint8_t queue_id, struct rte_event_queue_conf *queue_conf) { - EVENTDEV_DRV_FUNC_TRACE(); + EVENTDEV_INIT_FUNC_TRACE(); RTE_SET_USED(dev); RTE_SET_USED(queue_id); @@ -334,14 +334,14 @@ dpaa_event_queue_setup(struct rte_eventdev *dev, uint8_t queue_id, struct dpaa_eventdev *priv = dev->data->dev_private; struct dpaa_eventq *evq_info = &priv->evq_info[queue_id]; - EVENTDEV_DRV_FUNC_TRACE(); + EVENTDEV_INIT_FUNC_TRACE(); switch (queue_conf->schedule_type) { case RTE_SCHED_TYPE_PARALLEL: case RTE_SCHED_TYPE_ATOMIC: break; case RTE_SCHED_TYPE_ORDERED: - EVENTDEV_DRV_ERR("Schedule type is not supported."); + DPAA_EVENTDEV_ERR("Schedule type is not supported."); return -1; } evq_info->event_queue_cfg = queue_conf->event_queue_cfg; @@ -353,7 +353,7 @@ dpaa_event_queue_setup(struct rte_eventdev *dev, uint8_t queue_id, static void dpaa_event_queue_release(struct rte_eventdev *dev, uint8_t queue_id) { - EVENTDEV_DRV_FUNC_TRACE(); + EVENTDEV_INIT_FUNC_TRACE(); RTE_SET_USED(dev); RTE_SET_USED(queue_id); @@ -363,7 +363,7 @@ static void dpaa_event_port_default_conf_get(struct rte_eventdev *dev, uint8_t port_id, struct rte_event_port_conf *port_conf) { - EVENTDEV_DRV_FUNC_TRACE(); + EVENTDEV_INIT_FUNC_TRACE(); RTE_SET_USED(dev); RTE_SET_USED(port_id); @@ -379,7 +379,7 @@ dpaa_event_port_setup(struct rte_eventdev *dev, uint8_t port_id, { struct dpaa_eventdev *eventdev = dev->data->dev_private; - EVENTDEV_DRV_FUNC_TRACE(); + EVENTDEV_INIT_FUNC_TRACE(); RTE_SET_USED(port_conf); dev->data->ports[port_id] = &eventdev->ports[port_id]; @@ -390,7 +390,7 @@ dpaa_event_port_setup(struct rte_eventdev *dev, uint8_t port_id, static void dpaa_event_port_release(void *port) { - EVENTDEV_DRV_FUNC_TRACE(); + EVENTDEV_INIT_FUNC_TRACE(); RTE_SET_USED(port); } @@ -466,7 +466,7 @@ dpaa_event_eth_rx_adapter_caps_get(const struct rte_eventdev *dev, { const char *ethdev_driver = eth_dev->device->driver->name; - EVENTDEV_DRV_FUNC_TRACE(); + EVENTDEV_INIT_FUNC_TRACE(); RTE_SET_USED(dev); @@ -491,14 +491,14 @@ dpaa_event_eth_rx_adapter_queue_add( struct dpaa_if *dpaa_intf = eth_dev->data->dev_private; int ret, i; - EVENTDEV_DRV_FUNC_TRACE(); + EVENTDEV_INIT_FUNC_TRACE(); if (rx_queue_id == -1) { for (i = 0; i < dpaa_intf->nb_rx_queues; i++) { ret = dpaa_eth_eventq_attach(eth_dev, i, ch_id, queue_conf); if (ret) { - EVENTDEV_DRV_ERR( + DPAA_EVENTDEV_ERR( "Event Queue attach failed:%d\n", ret); goto detach_configured_queues; } @@ -508,7 +508,7 @@ dpaa_event_eth_rx_adapter_queue_add( ret = dpaa_eth_eventq_attach(eth_dev, rx_queue_id, ch_id, queue_conf); if (ret) - EVENTDEV_DRV_ERR("dpaa_eth_eventq_attach failed:%d\n", ret); + DPAA_EVENTDEV_ERR("dpaa_eth_eventq_attach failed:%d\n", ret); return ret; detach_configured_queues: @@ -527,14 +527,14 @@ dpaa_event_eth_rx_adapter_queue_del(const struct rte_eventdev *dev, int ret, i; struct dpaa_if *dpaa_intf = eth_dev->data->dev_private; - EVENTDEV_DRV_FUNC_TRACE(); + EVENTDEV_INIT_FUNC_TRACE(); RTE_SET_USED(dev); if (rx_queue_id == -1) { for (i = 0; i < dpaa_intf->nb_rx_queues; i++) { ret = dpaa_eth_eventq_detach(eth_dev, i); if (ret) - EVENTDEV_DRV_ERR( + DPAA_EVENTDEV_ERR( "Event Queue detach failed:%d\n", ret); } @@ -543,7 +543,7 @@ dpaa_event_eth_rx_adapter_queue_del(const struct rte_eventdev *dev, ret = dpaa_eth_eventq_detach(eth_dev, rx_queue_id); if (ret) - EVENTDEV_DRV_ERR("dpaa_eth_eventq_detach failed:%d\n", ret); + DPAA_EVENTDEV_ERR("dpaa_eth_eventq_detach failed:%d\n", ret); return ret; } @@ -551,7 +551,7 @@ static int dpaa_event_eth_rx_adapter_start(const struct rte_eventdev *dev, const struct rte_eth_dev *eth_dev) { - EVENTDEV_DRV_FUNC_TRACE(); + EVENTDEV_INIT_FUNC_TRACE(); RTE_SET_USED(dev); RTE_SET_USED(eth_dev); @@ -563,7 +563,7 @@ static int dpaa_event_eth_rx_adapter_stop(const struct rte_eventdev *dev, const struct rte_eth_dev *eth_dev) { - EVENTDEV_DRV_FUNC_TRACE(); + EVENTDEV_INIT_FUNC_TRACE(); RTE_SET_USED(dev); RTE_SET_USED(eth_dev); @@ -603,7 +603,7 @@ dpaa_event_dev_create(const char *name) sizeof(struct dpaa_eventdev), rte_socket_id()); if (eventdev == NULL) { - EVENTDEV_DRV_ERR("Failed to create eventdev vdev %s", name); + DPAA_EVENTDEV_ERR("Failed to create eventdev vdev %s", name); goto fail; } @@ -631,7 +631,7 @@ dpaa_event_dev_probe(struct rte_vdev_device *vdev) const char *name; name = rte_vdev_device_name(vdev); - EVENTDEV_DRV_LOG("Initializing %s", name); + DPAA_EVENTDEV_INFO("Initializing %s", name); return dpaa_event_dev_create(name); } @@ -642,7 +642,7 @@ dpaa_event_dev_remove(struct rte_vdev_device *vdev) const char *name; name = rte_vdev_device_name(vdev); - EVENTDEV_DRV_LOG("Closing %s", name); + DPAA_EVENTDEV_INFO("Closing %s", name); return rte_event_pmd_vdev_uninit(name); } diff --git a/drivers/event/dpaa/dpaa_eventdev.h b/drivers/event/dpaa/dpaa_eventdev.h index 583e46c..3994bd6 100644 --- a/drivers/event/dpaa/dpaa_eventdev.h +++ b/drivers/event/dpaa/dpaa_eventdev.h @@ -12,13 +12,6 @@ #define EVENTDEV_NAME_DPAA_PMD event_dpaa1 -#define EVENTDEV_DRV_LOG(fmt, args...) \ - DPAA_EVENTDEV_INFO(fmt, ## args) -#define EVENTDEV_DRV_FUNC_TRACE() \ - DPAA_EVENTDEV_DEBUG("%s() Called:\n", __func__) -#define EVENTDEV_DRV_ERR(fmt, args...) \ - DPAA_EVENTDEV_ERR("%s(): " fmt "\n", __func__, ## args) - #define DPAA_EVENT_MAX_PORTS 8 #define DPAA_EVENT_MAX_QUEUES 16 #define DPAA_EVENT_MIN_DEQUEUE_TIMEOUT 1 -- 2.7.4