[PATCH] staging: pi433: Use matching enum types calling rf69_set_packet_format

Path	csiph.com!news.mixmin.net!aioe.org!bofh.it!news.nic.it!robomod
From	Elia Geretto <elia.f.geretto@gmail.com>
Newsgroups	linux.kernel
Subject	[PATCH] staging: pi433: Use matching enum types calling rf69_set_packet_format
Date	Sat, 29 Jul 2017 11:40:02 +0200
Message-ID	<u8wo2-fs-29@gated-at.bofh.it> (permalink)
Dkim-Signature	v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=Bq/ola52g9eOBGbUxxiCRRTywKI6IP2J9Gmgu/B3ejs=; b=pzSG/k4smDfHBYTImpHB0bQG6HfkhDsbcL8BYx0VSD2b+KTlloHtRvphbee6fVSluB icVhYLZydVfZ4m9uRgyIp74gZELX8Ub14ao5Yw4AdZzztwbzKV4eyImkSo2h23y0MLYy gAIP5qCvSitxEYFW7hDWMaRQ546VG7t9mmWKOzOKLXJc0EzzxQxNgK/03eH5M4Ja+Nim YgHVwYxLhDYSDxrDtPPlZ7UlGqUTOppkrh9QPb6jN1jho9dc/BwJ6yGUkiFnNPoi3n0a 6MFoc1NeLxefS1xsn67Gse+Kw+A+xTVRVnc+DGUVAB7YSSHWl7RqlzTr+Cat6zI9gW8m yVRQ==
X-Google-Dkim-Signature	v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=Bq/ola52g9eOBGbUxxiCRRTywKI6IP2J9Gmgu/B3ejs=; b=YsiWqGd3fFUYOhXC4Kto81lkRdZdfdZ0eyjEQ4yti8ddn3MuRTk1iqjtJ5JB8ca8i/ kpDijjVgwgNIGJ1L1xLdGnBdRqOZh7VjI+iDCsZIS8YxMzRTzQlwucqmcFKn9ZONjdct 2JeK410pjXvX2NnaleLPe4s7NumWH2OR4RswqLEKud4U5WME9tsG85NHyiYE6PgIOmIf Kbi8QUQctdV9uUtAeZ5f8AnT+UR48yC51GksdcZeQLTxOTqCPXs1Uv3AsJwmov3rZigm MuTBDeNPQeI4zweGsFzhnvGOukGWUGt3O5TMAngDCZuoi9z2i+5JIeVgc7O9wZnxOvHG huMA==
X-Gm-Message-State	AIVw113SI73JiYgDmKbw4VUbrViUOQ0R7lz9Us6XYQDl1j+LhmAcCwe5 zCJB8gtwqjW7Ng==
X-Received	by 10.28.68.138 with SMTP id r132mr7123158wma.26.1501320695435; Sat, 29 Jul 2017 02:31:35 -0700 (PDT)
X-Mailer	git-send-email 2.13.3
Sender	robomod@news.nic.it
List-ID	<linux-kernel.vger.kernel.org>
X-Mailing-List	linux-kernel@vger.kernel.org
Approved	robomod@news.nic.it
Lines	68
Organization	linux.* mail to news gateway
X-Original-Cc	Elia Geretto <elia.f.geretto@gmail.com>
X-Original-Date	Sat, 29 Jul 2017 11:29:13 +0200
X-Original-Message-ID	<20170729092913.28821-1-elia.f.geretto@gmail.com>
X-Original-Sender	linux-kernel-owner@vger.kernel.org
Xref	csiph.com linux.kernel:1699279

Show key headers only | View raw

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>
---
 drivers/staging/pi433/pi433_if.c | 24 ++++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/drivers/staging/pi433/pi433_if.c b/drivers/staging/pi433/pi433_if.c
index d9328ce5ec1d..fc2250810eed 100644
--- a/drivers/staging/pi433/pi433_if.c
+++ b/drivers/staging/pi433/pi433_if.c
@@ -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 */
-- 
2.13.3

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH] staging: pi433: Use matching enum types calling rf69_set_packet_format Elia Geretto <elia.f.geretto@gmail.com> - 2017-07-29 11:40 +0200
  Re: [PATCH] staging: pi433: Use matching enum types calling  rf69_set_packet_format Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-07-30 19:10 +0200

csiph-web