From 9cb3fb7724a34ab8eae1be52df694e470fcf68c2 Mon Sep 17 00:00:00 2001 From: Jakub Palider Date: Mon, 26 Jul 2021 08:58:14 -0500 Subject: [PATCH] common/cnxk: align function naming There is an inconsistency in naming interrupt control functions. This patch aligns names accordingly. Signed-off-by: Jakub Palider Acked-by: Jerin Jacob --- drivers/common/cnxk/roc_bphy_irq.c | 2 +- drivers/common/cnxk/roc_bphy_irq.h | 3 +-- drivers/common/cnxk/version.map | 2 +- drivers/raw/cnxk_bphy/cnxk_bphy_irq.c | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/drivers/common/cnxk/roc_bphy_irq.c b/drivers/common/cnxk/roc_bphy_irq.c index be3c4054af..53eb89c2f1 100644 --- a/drivers/common/cnxk/roc_bphy_irq.c +++ b/drivers/common/cnxk/roc_bphy_irq.c @@ -319,7 +319,7 @@ roc_bphy_intr_available(struct roc_bphy_irq_chip *irq_chip, int irq_num) } int -roc_bphy_handler_clear(struct roc_bphy_irq_chip *chip, int irq_num) +roc_bphy_intr_clear(struct roc_bphy_irq_chip *chip, int irq_num) { roc_cpuset_t orig_cpuset, intr_cpuset; const struct plt_memzone *mz; diff --git a/drivers/common/cnxk/roc_bphy_irq.h b/drivers/common/cnxk/roc_bphy_irq.h index 0d1335b201..185b6354a5 100644 --- a/drivers/common/cnxk/roc_bphy_irq.h +++ b/drivers/common/cnxk/roc_bphy_irq.h @@ -35,8 +35,7 @@ __roc_api void roc_bphy_intr_fini(struct roc_bphy_irq_chip *irq_chip); __roc_api void roc_bphy_intr_handler(unsigned int irq_num); __roc_api bool roc_bphy_intr_available(struct roc_bphy_irq_chip *irq_chip, int irq_num); -__roc_api int roc_bphy_handler_clear(struct roc_bphy_irq_chip *chip, - int irq_num); +__roc_api int roc_bphy_intr_clear(struct roc_bphy_irq_chip *chip, int irq_num); __roc_api int roc_bphy_intr_register(struct roc_bphy_irq_chip *irq_chip, struct roc_bphy_intr *intr); diff --git a/drivers/common/cnxk/version.map b/drivers/common/cnxk/version.map index b4dd95b5af..4acf80c089 100644 --- a/drivers/common/cnxk/version.map +++ b/drivers/common/cnxk/version.map @@ -37,8 +37,8 @@ INTERNAL { roc_bphy_cgx_stop_rxtx; roc_bphy_dev_fini; roc_bphy_dev_init; - roc_bphy_handler_clear; roc_bphy_intr_available; + roc_bphy_intr_clear; roc_bphy_intr_fini; roc_bphy_intr_handler; roc_bphy_intr_init; diff --git a/drivers/raw/cnxk_bphy/cnxk_bphy_irq.c b/drivers/raw/cnxk_bphy/cnxk_bphy_irq.c index ac1d51777b..1fb3bf786b 100644 --- a/drivers/raw/cnxk_bphy/cnxk_bphy_irq.c +++ b/drivers/raw/cnxk_bphy/cnxk_bphy_irq.c @@ -85,7 +85,7 @@ cnxk_bphy_intr_unregister(uint16_t dev_id, int irq_num) struct bphy_device *bphy_dev = cnxk_bphy_get_bphy_dev_by_dev_id(dev_id); if (bphy_dev->irq_chip) - roc_bphy_handler_clear(bphy_dev->irq_chip, irq_num); + roc_bphy_intr_clear(bphy_dev->irq_chip, irq_num); else plt_err("Missing irq chip"); } -- 2.20.1