diff options
author | Mark A. Greer <mgreer@animalcreek.com> | 2014-09-02 18:12:27 -0400 |
---|---|---|
committer | Samuel Ortiz <sameo@linux.intel.com> | 2014-09-07 17:13:43 -0400 |
commit | 5974150dead6da1db415f04a232f79b922f412a0 (patch) | |
tree | 5ce066ba8942b4e49d639b5a9f2d646a8570046b /drivers/nfc/trf7970a.c | |
parent | aff0564aa7b2118a1d76dc0118dfdbf4beaf4b8c (diff) |
NFC: trf7970a: Remove unnecessary FIFO reset & RSSI read
It is no longer necessary to reset the FIFO and
read the 'RSSI Levels and Oscillator Status Register'
so remove that code.
Signed-off-by: Mark A. Greer <mgreer@animalcreek.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers/nfc/trf7970a.c')
-rw-r--r-- | drivers/nfc/trf7970a.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/drivers/nfc/trf7970a.c b/drivers/nfc/trf7970a.c index e7f22a44dc52..c6216c1cc4b9 100644 --- a/drivers/nfc/trf7970a.c +++ b/drivers/nfc/trf7970a.c | |||
@@ -478,8 +478,6 @@ static int trf7970a_read_irqstatus(struct trf7970a *trf, u8 *status) | |||
478 | 478 | ||
479 | static void trf7970a_send_upstream(struct trf7970a *trf) | 479 | static void trf7970a_send_upstream(struct trf7970a *trf) |
480 | { | 480 | { |
481 | u8 rssi; | ||
482 | |||
483 | dev_kfree_skb_any(trf->tx_skb); | 481 | dev_kfree_skb_any(trf->tx_skb); |
484 | trf->tx_skb = NULL; | 482 | trf->tx_skb = NULL; |
485 | 483 | ||
@@ -488,13 +486,6 @@ static void trf7970a_send_upstream(struct trf7970a *trf) | |||
488 | 16, 1, trf->rx_skb->data, trf->rx_skb->len, | 486 | 16, 1, trf->rx_skb->data, trf->rx_skb->len, |
489 | false); | 487 | false); |
490 | 488 | ||
491 | /* According to the manual it is "good form" to reset the fifo and | ||
492 | * read the RSSI levels & oscillator status register here. It doesn't | ||
493 | * explain why. | ||
494 | */ | ||
495 | trf7970a_cmd(trf, TRF7970A_CMD_FIFO_RESET); | ||
496 | trf7970a_read(trf, TRF7970A_RSSI_OSC_STATUS, &rssi); | ||
497 | |||
498 | trf->state = TRF7970A_ST_IDLE; | 489 | trf->state = TRF7970A_ST_IDLE; |
499 | 490 | ||
500 | if (trf->aborting) { | 491 | if (trf->aborting) { |