staging: pi433: Use matching enum types calling rf69_set_packet_format

This patch fixes the following four warnings found using sparse:

drivers/staging/pi433/pi433_if.c:211:9: warning: mixing different enum types
drivers/staging/pi433/pi433_if.c:211:9:     int enum optionOnOff  versus
drivers/staging/pi433/pi433_if.c:211:9:     int enum packetFormat
drivers/staging/pi433/pi433_if.c:211:9: warning: mixing different enum types
drivers/staging/pi433/pi433_if.c:211:9:     int enum optionOnOff  versus
drivers/staging/pi433/pi433_if.c:211:9:     int enum packetFormat
drivers/staging/pi433/pi433_if.c:268:9: warning: mixing different enum types
drivers/staging/pi433/pi433_if.c:268:9:     int enum optionOnOff  versus
drivers/staging/pi433/pi433_if.c:268:9:     int enum packetFormat
drivers/staging/pi433/pi433_if.c:268:9: warning: mixing different enum types
drivers/staging/pi433/pi433_if.c:268:9:     int enum optionOnOff  versus
drivers/staging/pi433/pi433_if.c:268:9:     int enum packetFormat

This is done calling the rf69_set_packet_format function using the
appropriate enum for the packetFormat argument.

Signed-off-by: Elia Geretto <elia.f.geretto@gmail.com>
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 ed737f4b1e77d8c73843c0ed79b7e9c628b3f6b7..6588a507dfec563820f96b47e0be1e17c5300cab 100644 (file)
--- a/drivers/staging/pi433/pi433_if.c
+++ b/drivers/staging/pi433/pi433_if.c
@@ -184,6 +184,7 @@ static void *DIO_irq_handler[NUM_DIO] = {
 static int
 rf69_set_rx_cfg(struct pi433_device *dev, struct pi433_rx_cfg *rx_cfg)
 {
+       int ret;
        int payload_length;
 
        /* receiver config */
@@ -210,7 +211,15 @@ rf69_set_rx_cfg(struct pi433_device *dev, struct pi433_rx_cfg *rx_cfg)
        {
                SET_CHECKED(rf69_set_fifo_fill_condition(dev->spi, always));
        }
-       SET_CHECKED(rf69_set_packet_format  (dev->spi, rx_cfg->enable_length_byte));
+       if (rx_cfg->enable_length_byte == optionOn) {
+               ret = rf69_set_packet_format(dev->spi, packetLengthVar);
+               if (ret < 0)
+                       return ret;
+       } else {
+               ret = rf69_set_packet_format(dev->spi, packetLengthFix);
+               if (ret < 0)
+                       return ret;
+       }
        SET_CHECKED(rf69_set_adressFiltering(dev->spi, rx_cfg->enable_address_filtering));
        SET_CHECKED(rf69_set_crc_enable     (dev->spi, rx_cfg->enable_crc));
 
@@ -249,6 +258,8 @@ rf69_set_rx_cfg(struct pi433_device *dev, struct pi433_rx_cfg *rx_cfg)
 static int
 rf69_set_tx_cfg(struct pi433_device *dev, struct pi433_tx_cfg *tx_cfg)
 {
+       int ret;
+
        SET_CHECKED(rf69_set_frequency  (dev->spi, tx_cfg->frequency));
        SET_CHECKED(rf69_set_bit_rate   (dev->spi, tx_cfg->bit_rate));
        SET_CHECKED(rf69_set_modulation (dev->spi, tx_cfg->modulation));
@@ -267,7 +278,15 @@ 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));
-       SET_CHECKED(rf69_set_packet_format(dev->spi, tx_cfg->enable_length_byte));
+       if (tx_cfg->enable_length_byte == optionOn) {
+               ret = rf69_set_packet_format(dev->spi, packetLengthVar);
+               if (ret < 0)
+                       return ret;
+       } else {
+               ret = rf69_set_packet_format(dev->spi, packetLengthFix);
+               if (ret < 0)
+                       return ret;
+       }
        SET_CHECKED(rf69_set_crc_enable   (dev->spi, tx_cfg->enable_crc));
 
        /* configure sync, if enabled */