All of lore.kernel.org
 help / color / mirror / Atom feed
From: Alexander Aring <alex.aring@gmail.com>
To: linux-wpan@vger.kernel.org
Cc: kernel@pengutronix.de, Alexander Aring <alex.aring@gmail.com>
Subject: [PATCH wpan-next 4/6] at86rf230: remove unnecessary tx state change
Date: Tue, 28 Apr 2015 23:22:32 +0200	[thread overview]
Message-ID: <1430256154-1813-5-git-send-email-alex.aring@gmail.com> (raw)
In-Reply-To: <1430256154-1813-1-git-send-email-alex.aring@gmail.com>

All supported transceivers can do a valid state change from TRX_OFF to
TX_ARET. This patach removes the state change chain from TRX_OFF ->
TX_ON -> TX_ARET instead we doing a directly state change from TRX_OFF
to TX_ARET.

Signed-off-by: Alexander Aring <alex.aring@gmail.com>
---
 drivers/net/ieee802154/at86rf230.c | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/drivers/net/ieee802154/at86rf230.c b/drivers/net/ieee802154/at86rf230.c
index f99dce5..6285145 100644
--- a/drivers/net/ieee802154/at86rf230.c
+++ b/drivers/net/ieee802154/at86rf230.c
@@ -781,16 +781,6 @@ at86rf230_tx_on(void *context)
 }
 
 static void
-at86rf230_tx_trac_error(void *context)
-{
-	struct at86rf230_state_change *ctx = context;
-	struct at86rf230_local *lp = ctx->lp;
-
-	at86rf230_async_state_change(lp, ctx, STATE_TX_ON,
-				     at86rf230_tx_on, true);
-}
-
-static void
 at86rf230_tx_trac_check(void *context)
 {
 	struct at86rf230_state_change *ctx = context;
@@ -799,12 +789,12 @@ at86rf230_tx_trac_check(void *context)
 	const u8 trac = (buf[1] & 0xe0) >> 5;
 
 	/* If trac status is different than zero we need to do a state change
-	 * to STATE_FORCE_TRX_OFF then STATE_TX_ON to recover the transceiver
-	 * state to TX_ON.
+	 * to STATE_FORCE_TRX_OFF then STATE_RX_AACK_ON to recover the
+	 * transceiver.
 	 */
 	if (trac)
 		at86rf230_async_state_change(lp, ctx, STATE_FORCE_TRX_OFF,
-					     at86rf230_tx_trac_error, true);
+					     at86rf230_tx_on, true);
 	else
 		at86rf230_tx_on(context);
 }
-- 
2.3.6


  parent reply	other threads:[~2015-04-28 21:23 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-04-28 21:22 [PATCH wpan-next 0/6] at86rf230: cleanups and transmit improvements Alexander Aring
2015-04-28 21:22 ` [PATCH wpan-next 1/6] at86rf230: remove tabs after define Alexander Aring
2015-04-28 21:22 ` [PATCH wpan-next 2/6] at86rf230: move cal_timeout to state change Alexander Aring
2015-04-28 21:22 ` [PATCH wpan-next 3/6] at86rf230: add TX_ARET_ON for calibration timeout Alexander Aring
2015-04-28 21:22 ` Alexander Aring [this message]
2015-04-28 21:22 ` [PATCH wpan-next 5/6] at86rf230: change state change if from trx_off Alexander Aring
2015-04-29  4:05   ` Varka Bhadram
2015-04-28 21:22 ` [PATCH wpan-next 6/6] at86rf230: add slp_tr support to start tx Alexander Aring

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1430256154-1813-5-git-send-email-alex.aring@gmail.com \
    --to=alex.aring@gmail.com \
    --cc=kernel@pengutronix.de \
    --cc=linux-wpan@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.