staging: pi433: Split rf69_set_sync_enabled into two functions

Splits rf69_set_sync_enabled(dev, enabled) into
rf69_enable_sync(dev) and rf69_disable_sync(dev).

Signed-off-by: Simon Sandström <simon@nikanor.nu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/pi433/pi433_if.c b/drivers/staging/pi433/pi433_if.c
index 614eec7dd9041d51b56039667e1ef924ae9c29cb..fb500d062df8760d9bb4853dacbbf83e8e082ec4 100644 (file)
--- a/drivers/staging/pi433/pi433_if.c
+++ b/drivers/staging/pi433/pi433_if.c
@@ -197,13 +197,20 @@ rf69_set_rx_cfg(struct pi433_device *dev, struct pi433_rx_cfg *rx_cfg)
 
        /* packet config */
        /* enable */
-       SET_CHECKED(rf69_set_sync_enable(dev->spi, rx_cfg->enable_sync));
        if (rx_cfg->enable_sync == OPTION_ON)
        {
+               ret = rf69_enable_sync(dev->spi);
+               if (ret < 0)
+                       return ret;
+
                SET_CHECKED(rf69_set_fifo_fill_condition(dev->spi, afterSyncInterrupt));
        }
        else
        {
+               ret = rf69_disable_sync(dev->spi);
+               if (ret < 0)
+                       return ret;
+
                SET_CHECKED(rf69_set_fifo_fill_condition(dev->spi, always));
        }
        if (rx_cfg->enable_length_byte == OPTION_ON) {
@@ -281,7 +288,17 @@ rf69_set_tx_cfg(struct pi433_device *dev, struct pi433_tx_cfg *tx_cfg)
        {
                SET_CHECKED(rf69_set_preamble_length(dev->spi, 0));
        }
-       SET_CHECKED(rf69_set_sync_enable  (dev->spi, tx_cfg->enable_sync));
+
+       if (tx_cfg->enable_sync == OPTION_ON) {
+               ret = rf69_enable_sync(dev->spi);
+               if (ret < 0)
+                       return ret;
+       } else {
+               ret = rf69_disable_sync(dev->spi);
+               if (ret < 0)
+                       return ret;
+       }
+
        if (tx_cfg->enable_length_byte == OPTION_ON) {
                ret = rf69_set_packet_format(dev->spi, packetLengthVar);
                if (ret < 0)

diff --git a/drivers/staging/pi433/rf69.c b/drivers/staging/pi433/rf69.c
index 8c9c9bb91c53faa4dffea6ed8ca4545295764bdf..12a1091d99366b87f99ab69e2921fada6493f8e9 100644 (file)
--- a/drivers/staging/pi433/rf69.c
+++ b/drivers/staging/pi433/rf69.c
@@ -746,20 +746,14 @@ int rf69_set_preamble_length(struct spi_device *spi, u16 preambleLength)
        return retval;
 }
 
-int rf69_set_sync_enable(struct spi_device *spi,
-                        enum option_on_off option_on_off)
+int rf69_enable_sync(struct spi_device *spi)
 {
-       #ifdef DEBUG
-               dev_dbg(&spi->dev, "set: sync enable");
-       #endif
+       return rf69_set_bit(spi, REG_SYNC_CONFIG, MASK_SYNC_CONFIG_SYNC_ON);
+}
 
-       switch (option_on_off) {
-       case OPTION_ON: return rf69_set_bit(spi, REG_SYNC_CONFIG, MASK_SYNC_CONFIG_SYNC_ON);
-       case OPTION_OFF: return rf69_clear_bit(spi, REG_SYNC_CONFIG, MASK_SYNC_CONFIG_SYNC_ON);
-       default:
-               dev_dbg(&spi->dev, "set: illegal input param");
-               return -EINVAL;
-       }
+int rf69_disable_sync(struct spi_device *spi)
+{
+       return rf69_clear_bit(spi, REG_SYNC_CONFIG, MASK_SYNC_CONFIG_SYNC_ON);
 }
 
 int rf69_set_fifo_fill_condition(struct spi_device *spi, enum fifoFillCondition fifoFillCondition)

diff --git a/drivers/staging/pi433/rf69.h b/drivers/staging/pi433/rf69.h
index 9428dee97de75dfc774f875874e2c24e8f864658..177223451c87131bd78f476a69132189000eb77a 100644 (file)
--- a/drivers/staging/pi433/rf69.h
+++ b/drivers/staging/pi433/rf69.h
@@ -59,8 +59,8 @@ int rf69_set_rssi_threshold(struct spi_device *spi, u8 threshold);
 int rf69_set_rx_start_timeout(struct spi_device *spi, u8 timeout);
 int rf69_set_rssi_timeout(struct spi_device *spi, u8 timeout);
 int rf69_set_preamble_length(struct spi_device *spi, u16 preambleLength);
-int rf69_set_sync_enable(struct spi_device *spi,
-                        enum option_on_off option_on_off);
+int rf69_enable_sync(struct spi_device *spi);
+int rf69_disable_sync(struct spi_device *spi);
 int rf69_set_fifo_fill_condition(struct spi_device *spi, enum fifoFillCondition fifoFillCondition);
 int rf69_set_sync_size(struct spi_device *spi, u8 sync_size);
 int rf69_set_sync_tolerance(struct spi_device *spi, u8 syncTolerance);