Commit 125a452c authored by Elia Geretto's avatar Elia Geretto Committed by Greg Kroah-Hartman

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: default avatarElia Geretto <elia.f.geretto@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 0116ced9
...@@ -184,6 +184,7 @@ static void *DIO_irq_handler[NUM_DIO] = { ...@@ -184,6 +184,7 @@ static void *DIO_irq_handler[NUM_DIO] = {
static int static int
rf69_set_rx_cfg(struct pi433_device *dev, struct pi433_rx_cfg *rx_cfg) rf69_set_rx_cfg(struct pi433_device *dev, struct pi433_rx_cfg *rx_cfg)
{ {
int ret;
int payload_length; int payload_length;
/* receiver config */ /* receiver config */
...@@ -210,7 +211,15 @@ rf69_set_rx_cfg(struct pi433_device *dev, struct pi433_rx_cfg *rx_cfg) ...@@ -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_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_adressFiltering(dev->spi, rx_cfg->enable_address_filtering));
SET_CHECKED(rf69_set_crc_enable (dev->spi, rx_cfg->enable_crc)); 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) ...@@ -249,6 +258,8 @@ rf69_set_rx_cfg(struct pi433_device *dev, struct pi433_rx_cfg *rx_cfg)
static int static int
rf69_set_tx_cfg(struct pi433_device *dev, struct pi433_tx_cfg *tx_cfg) 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_frequency (dev->spi, tx_cfg->frequency));
SET_CHECKED(rf69_set_bit_rate (dev->spi, tx_cfg->bit_rate)); SET_CHECKED(rf69_set_bit_rate (dev->spi, tx_cfg->bit_rate));
SET_CHECKED(rf69_set_modulation (dev->spi, tx_cfg->modulation)); 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) ...@@ -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_preamble_length(dev->spi, 0));
} }
SET_CHECKED(rf69_set_sync_enable (dev->spi, tx_cfg->enable_sync)); 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)); SET_CHECKED(rf69_set_crc_enable (dev->spi, tx_cfg->enable_crc));
/* configure sync, if enabled */ /* configure sync, if enabled */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment