2015-12-02 22:18:42

by Geyslan G. Bem

Subject: [PATCH] usb: use BUG_ON() instead of BUG()

Replace BUG() with BUG_ON().

Caught by coccinelle.

Signed-off-by: Geyslan G. Bem <[email protected]>
---
drivers/usb/host/oxu210hp-hcd.c | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/drivers/usb/host/oxu210hp-hcd.c b/drivers/usb/host/oxu210hp-hcd.c
index 1f139d8..bc74aca 100644
--- a/drivers/usb/host/oxu210hp-hcd.c
+++ b/drivers/usb/host/oxu210hp-hcd.c
@@ -394,8 +394,7 @@ static void ehci_quiesce(struct oxu_hcd *oxu)
u32 temp;

#ifdef DEBUG
- if (!HC_IS_RUNNING(oxu_to_hcd(oxu)->state))
- BUG();
+ BUG_ON(!HC_IS_RUNNING(oxu_to_hcd(oxu)->state));
#endif

/* wait for any schedule enables/disables to take effect */
@@ -1709,9 +1708,8 @@ static void start_unlink_async(struct oxu_hcd *oxu, struct ehci_qh *qh)

#ifdef DEBUG
assert_spin_locked(&oxu->lock);
- if (oxu->reclaim || (qh->qh_state != QH_STATE_LINKED
- && qh->qh_state != QH_STATE_UNLINK_WAIT))
- BUG();
+ BUG_ON(oxu->reclaim || (qh->qh_state != QH_STATE_LINKED
+ && qh->qh_state != QH_STATE_UNLINK_WAIT));
#endif

/* stop async schedule right now? */
--
2.6.3

2015-12-07 10:10:50

by Peter Senna Tschudin

Subject: Re: [PATCH] usb: use BUG_ON() instead of BUG()

On Wed, Dec 2, 2015 at 11:18 PM, Geyslan G. Bem <[email protected]> wrote:
> Replace BUG() with BUG_ON().
>
> Caught by coccinelle.
I would mention the path to the .cocci script, but other than that:
Acked-by: Peter Senna Tschudin <[email protected]>

>
> Signed-off-by: Geyslan G. Bem <[email protected]>
> ---
> drivers/usb/host/oxu210hp-hcd.c | 8 +++-----
> 1 file changed, 3 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/usb/host/oxu210hp-hcd.c b/drivers/usb/host/oxu210hp-hcd.c
> index 1f139d8..bc74aca 100644
> --- a/drivers/usb/host/oxu210hp-hcd.c
> +++ b/drivers/usb/host/oxu210hp-hcd.c
> @@ -394,8 +394,7 @@ static void ehci_quiesce(struct oxu_hcd *oxu)
> u32 temp;
>
> #ifdef DEBUG
> - if (!HC_IS_RUNNING(oxu_to_hcd(oxu)->state))
> - BUG();
> + BUG_ON(!HC_IS_RUNNING(oxu_to_hcd(oxu)->state));
> #endif
>
> /* wait for any schedule enables/disables to take effect */
> @@ -1709,9 +1708,8 @@ static void start_unlink_async(struct oxu_hcd *oxu, struct ehci_qh *qh)
>
> #ifdef DEBUG
> assert_spin_locked(&oxu->lock);
> - if (oxu->reclaim || (qh->qh_state != QH_STATE_LINKED
> - && qh->qh_state != QH_STATE_UNLINK_WAIT))
> - BUG();
> + BUG_ON(oxu->reclaim || (qh->qh_state != QH_STATE_LINKED
> + && qh->qh_state != QH_STATE_UNLINK_WAIT));
> #endif
>
> /* stop async schedule right now? */
> --
> 2.6.3
>



--
Peter