staging: pi433: Fix rf69_set_tx_cfg() logic
PATCH 1/1 staging: pi433: Fix rf69_set_tx_cfg() logic
Moved code to configure sync to where check enable_sync option before. There is no need to check enable_sync twice. Configuring sync should be executed immediately after enabling sync.
--- drivers/staging/pi433/pi433_if.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-)
drivers/staging/pi433/pi433_if.c +7 -10
@@ -318,10 +318,17 @@ rf69_set_tx_cfg(struct pi433_device *dev, struct pi433_tx_cfg *tx_cfg)return ret; } +/* configure sync, if enabled */ if (tx_cfg->enable_sync ==OPTION_ON ) { ret =rf69_enable_sync (dev->spi);if (ret <0 )return ret; + ret =rf69_set_sync_size (dev->spi, tx_cfg->sync_length); +if (ret <0 ) +return ret; + ret =rf69_set_sync_values (dev->spi, tx_cfg->sync_pattern); +if (ret <0 ) +return ret; }else { ret =rf69_disable_sync (dev->spi);if (ret <0 )
@@ -348,16 +355,6 @@ rf69_set_tx_cfg(struct pi433_device *dev, struct pi433_tx_cfg *tx_cfg)return ret; } -/* configure sync, if enabled */ -if (tx_cfg->enable_sync ==OPTION_ON ) { - ret =rf69_set_sync_size (dev->spi, tx_cfg->sync_length); -if (ret <0 ) -return ret; - ret =rf69_set_sync_values (dev->spi, tx_cfg->sync_pattern); -if (ret <0 ) -return ret; - } -return 0 ; }
Signature · 1 line
2.17.1
Quoted 14 lines · Sidong Yang
Moved code to configure sync to where check
enable_syncoption before. There is no need to checkenable_synctwice. Configuring sync should be executed immediately after enabling sync.Signed-off-by Sidong Yang <[email protected]>--- drivers/staging/pi433/pi433_if.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-)drivers/staging/pi433/pi433_if.c +0
-0
drivers/staging/pi433/pi433_if.c rf69_set_tx_cfg(struct pi433_device *dev, struct pi433_tx_cfg *tx_cfg) · line 321
Quoted 4 lines
drivers/staging/pi433/pi433_if.c +1
-0@@ -318,10 +318,17 @@ rf69_set_tx_cfg(struct pi433_device *dev, struct pi433_tx_cfg *tx_cfg)return ret; } +/* configure sync, if enabled */
This comment is obvious. Just delete it.
drivers/staging/pi433/pi433_if.c rf69_set_tx_cfg(struct pi433_device *dev, struct pi433_tx_cfg *tx_cfg) · line 331
Quoted 10 lines
drivers/staging/pi433/pi433_if.c +6
-0if (tx_cfg->enable_sync ==OPTION_ON ) { ret =rf69_enable_sync (dev->spi);if (ret <0 )return ret; + ret =rf69_set_sync_size (dev->spi, tx_cfg->sync_length); +if (ret <0 ) +return ret; + ret =rf69_set_sync_values (dev->spi, tx_cfg->sync_pattern); +if (ret <0 ) +return ret;
It's weird that we enable sync before we et the size or sync values...
regards,
dan carpenter