Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ff72550c authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "wil6210: change HALP logging category to IRQ"

parents 39c9e151 f53515cb

drivers/net/wireless/ath/wil6210/interrupt.c

+2 −2
Original line number Diff line number Diff line
@@ -599,7 +599,7 @@ void wil6210_clear_irq(struct wil6210_priv *wil) 


void wil6210_set_halp(struct wil6210_priv *wil)

{

	wil_dbg_misc(wil, "%s()\n", __func__);

	wil_dbg_irq(wil, "%s()\n", __func__);



	wil_w(wil, RGF_DMA_EP_MISC_ICR + offsetof(struct RGF_ICR, ICS),

	      BIT_DMA_EP_MISC_ICR_HALP);
@@ -607,7 +607,7 @@ void wil6210_set_halp(struct wil6210_priv *wil) 


void wil6210_clear_halp(struct wil6210_priv *wil)

{

	wil_dbg_misc(wil, "%s()\n", __func__);

	wil_dbg_irq(wil, "%s()\n", __func__);



	wil_w(wil, RGF_DMA_EP_MISC_ICR + offsetof(struct RGF_ICR, ICR),

	      BIT_DMA_EP_MISC_ICR_HALP);

drivers/net/wireless/ath/wil6210/main.c

+13 −13
Original line number Diff line number Diff line
@@ -1110,7 +1110,7 @@ void wil_halp_vote(struct wil6210_priv *wil) 


	mutex_lock(&wil->halp.lock);



	wil_dbg_misc(wil, "%s: start, HALP ref_cnt (%d)\n", __func__,

	wil_dbg_irq(wil, "%s: start, HALP ref_cnt (%d)\n", __func__,

		    wil->halp.ref_cnt);



	if (++wil->halp.ref_cnt == 1) {
@@ -1121,14 +1121,14 @@ void wil_halp_vote(struct wil6210_priv *wil) 
			/* Mask HALP as done in case the interrupt is raised */

			wil6210_mask_halp(wil);

		} else {

			wil_dbg_misc(wil,

			wil_dbg_irq(wil,

				    "%s: HALP vote completed after %d ms\n",

				    __func__,

				    jiffies_to_msecs(to_jiffies - rc));

		}

	}



	wil_dbg_misc(wil, "%s: end, HALP ref_cnt (%d)\n", __func__,

	wil_dbg_irq(wil, "%s: end, HALP ref_cnt (%d)\n", __func__,

		    wil->halp.ref_cnt);



	mutex_unlock(&wil->halp.lock);
@@ -1140,15 +1140,15 @@ void wil_halp_unvote(struct wil6210_priv *wil) 


	mutex_lock(&wil->halp.lock);



	wil_dbg_misc(wil, "%s: start, HALP ref_cnt (%d)\n", __func__,

	wil_dbg_irq(wil, "%s: start, HALP ref_cnt (%d)\n", __func__,

		    wil->halp.ref_cnt);



	if (--wil->halp.ref_cnt == 0) {

		wil6210_clear_halp(wil);

		wil_dbg_misc(wil, "%s: HALP unvote\n", __func__);

		wil_dbg_irq(wil, "%s: HALP unvote\n", __func__);

	}



	wil_dbg_misc(wil, "%s: end, HALP ref_cnt (%d)\n", __func__,

	wil_dbg_irq(wil, "%s: end, HALP ref_cnt (%d)\n", __func__,

		    wil->halp.ref_cnt);



	mutex_unlock(&wil->halp.lock);