staging: pi433: remove unnecessary calling rf69_set_mode()
authorSidong Yang <realwakka@gmail.com>
Sun, 24 Mar 2019 14:54:41 +0000 (14:54 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 25 Mar 2019 20:49:11 +0000 (05:49 +0900)
Remove unnecessary rf69_set_mode() function call when rx is waiting for
a telegram. There is waste to call rf69_set_mode() twice for becoming
standby mode.

Signed-off-by: Sidong Yang <realwakka@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/pi433/pi433_if.c

index 53928af..e822f87 100644 (file)
@@ -650,21 +650,19 @@ pi433_tx_thread(void *data)
                disable_irq(device->irq_num[DIO0]);
                device->tx_active = true;
 
+               /* clear fifo, set fifo threshold, set payload length */
+               retval = rf69_set_mode(spi, standby); /* this clears the fifo */
+               if (retval < 0)
+                       return retval;
+
                if (device->rx_active && !rx_interrupted) {
                        /*
                         * rx is currently waiting for a telegram;
                         * we need to set the radio module to standby
                         */
-                       retval = rf69_set_mode(device->spi, standby);
-                       if (retval < 0)
-                               return retval;
                        rx_interrupted = true;
                }
 
-               /* clear fifo, set fifo threshold, set payload length */
-               retval = rf69_set_mode(spi, standby); /* this clears the fifo */
-               if (retval < 0)
-                       return retval;
                retval = rf69_set_fifo_threshold(spi, FIFO_THRESHOLD);
                if (retval < 0)
                        return retval;