2021-04-23 08:31:31

by zhouchuangao

Subject: [PATCH] mips/bcm63xx: Use BUG_ON instead of if condition followed by BUG

BUG_ON uses unlikely in if(), it can be optimized at compile time.

Usually, the condition in if() is not satisfied. In my opinion,
this can improve the efficiency of the multi-stage pipeline.

Signed-off-by: zhouchuangao <[email protected]>
---
arch/mips/bcm63xx/gpio.c | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/arch/mips/bcm63xx/gpio.c b/arch/mips/bcm63xx/gpio.c
index 16f353a..5c4a233 100644
--- a/arch/mips/bcm63xx/gpio.c
+++ b/arch/mips/bcm63xx/gpio.c
@@ -43,8 +43,7 @@ static void bcm63xx_gpio_set(struct gpio_chip *chip,
u32 *v;
unsigned long flags;

- if (gpio >= chip->ngpio)
- BUG();
+ BUG_ON(gpio >= chip->ngpio);

if (gpio < 32) {
reg = gpio_out_low_reg;
@@ -70,8 +69,7 @@ static int bcm63xx_gpio_get(struct gpio_chip *chip, unsigned gpio)
u32 reg;
u32 mask;

- if (gpio >= chip->ngpio)
- BUG();
+ BUG_ON(gpio >= chip->ngpio);

if (gpio < 32) {
reg = gpio_out_low_reg;
@@ -92,8 +90,7 @@ static int bcm63xx_gpio_set_direction(struct gpio_chip *chip,
u32 tmp;
unsigned long flags;

- if (gpio >= chip->ngpio)
- BUG();
+ BUG_ON(gpio >= chip->ngpio);

if (gpio < 32) {
reg = GPIO_CTL_LO_REG;
--
2.7.4

2021-04-23 15:47:07

by Florian Fainelli

Subject: Re: [PATCH] mips/bcm63xx: Use BUG_ON instead of if condition followed by BUG

On 4/23/2021 1:30 AM, zhouchuangao wrote:
> BUG_ON uses unlikely in if(), it can be optimized at compile time.
>
> Usually, the condition in if() is not satisfied. In my opinion,
> this can improve the efficiency of the multi-stage pipeline.
>
> Signed-off-by: zhouchuangao <[email protected]>

Acked-by: Florian Fainelli <[email protected]>

Subject prefix should have been: MIPS: BCM63XX: Use BUG_ON instead of
condition followed by BUG to match prior submissions done to this
directory. Thanks.
--
Florian