Skip to contentSkip to conversation

staging: pi433: Use matching enum types calling rf69_set_packet_format

PATCH Superseded Elia Geretto 2 participants 2 messages Jul 29, 2017 – Jul 30, 2017 Staging

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Elia Geretto

author
#0 lore raw

PATCH 1/1 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 <[email protected]>
---
 drivers/staging/pi433/pi433_if.c | 24 ++++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)
drivers/staging/pi433/pi433_if.c +22 -2
index d9328ce5ec1d..fc2250810eed 100644
@@ -208,7 +208,17 @@ 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) {
+		int ret = rf69_set_packet_format(dev->spi, packetLengthVar);
+
+		if (ret < 0)
+			return ret;
+	} else {
+		int 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));
 

@@ -264,8 +274,18 @@ rf69_set_tx_cfg(struct pi433_device *dev, struct pi433_tx_cfg *tx_cfg)
 	{
 		SET_CHECKED(rf69_set_preamble_length(dev->spi, 0));
 	}
+	if (tx_cfg->enable_length_byte == optionOn) {
+		int ret = rf69_set_packet_format(dev->spi, packetLengthVar);
+
+		if (ret < 0)
+			return ret;
+	} else {
+		int ret = rf69_set_packet_format(dev->spi, packetLengthFix);
+
+		if (ret < 0)
+			return ret;
+	}
 	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));
 	SET_CHECKED(rf69_set_crc_enable	  (dev->spi, tx_cfg->enable_crc));
 
 	/* configure sync, if enabled */
Signature · 1 line
2.13.3
maintainer
#1 lore raw
Quoted 28 lines · Elia Geretto

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 <[email protected]>
---
 drivers/staging/pi433/pi433_if.c | 24 ++++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)
drivers/staging/pi433/pi433_if.c +0 -0
index d9328ce5ec1d..fc2250810eed 100644

drivers/staging/pi433/pi433_if.c rf69_set_rx_cfg(struct pi433_device *dev, struct pi433_rx_cfg *rx_cfg) · line 212

Quoted 6 lines
drivers/staging/pi433/pi433_if.c +2 -1
@@ -208,7 +208,17 @@ 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) {
+		int ret = rf69_set_packet_format(dev->spi, packetLengthVar);

Declare ret at the top of the function please, that will save you 2 extra blank lines (and more in the future as the horrid SET_CHECKED() macro gets removed...)

Quoted 13 lines
drivers/staging/pi433/pi433_if.c +9 -0
+
+		if (ret < 0)
+			return ret;
+	} else {
+		int 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));

drivers/staging/pi433/pi433_if.c rf69_set_tx_cfg(struct pi433_device *dev, struct pi433_tx_cfg *tx_cfg) · line 278

Quoted 5 lines
drivers/staging/pi433/pi433_if.c +2 -0
@@ -264,8 +274,18 @@ rf69_set_tx_cfg(struct pi433_device *dev, struct pi433_tx_cfg *tx_cfg)
 	{
 		SET_CHECKED(rf69_set_preamble_length(dev->spi, 0));
 	}
+	if (tx_cfg->enable_length_byte == optionOn) {
+		int ret = rf69_set_packet_format(dev->spi, packetLengthVar);

Same here.

drivers/staging/pi433/pi433_if.c rf69_set_tx_cfg(struct pi433_device *dev, struct pi433_tx_cfg *tx_cfg) · line 268

Quoted 11 lines
drivers/staging/pi433/pi433_if.c +9 -1
+
+		if (ret < 0)
+			return ret;
+	} else {
+		int ret = rf69_set_packet_format(dev->spi, packetLengthFix);
+
+		if (ret < 0)
+			return ret;
+	}
 	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));

Why move the location of the check?

thanks,

greg k-h