staging: pi433: fix CamelCase for packetFormat enum
PATCH v2 1/6 staging: pi433: fix CamelCase for packetFormat enum
Fixes checkpatch warnings:
CHECK: Avoid CamelCase: <packetFormat>
CHECK: Avoid CamelCase: <packetLengthFix>
CHECK: Avoid CamelCase: <packetLengthVar>
---
v2: order patches so they apply correctly
drivers/staging/pi433/pi433_if.c | 8 ++++---- drivers/staging/pi433/rf69.c | 8 ++++---- drivers/staging/pi433/rf69.h | 2 +- drivers/staging/pi433/rf69_enum.h | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-)
drivers/staging/pi433/pi433_if.c +4 -4
@@ -222,11 +222,11 @@ rf69_set_rx_cfg(struct pi433_device *dev, struct pi433_rx_cfg *rx_cfg)return ret; }if (rx_cfg->enable_length_byte ==OPTION_ON ) { - ret =rf69_set_packet_format (dev->spi, packetLengthVar); + ret =rf69_set_packet_format (dev->spi, packet_length_var);if (ret <0 )return ret; }else { - ret =rf69_set_packet_format (dev->spi, packetLengthFix); + ret =rf69_set_packet_format (dev->spi, packet_length_fix);if (ret <0 )return ret; }
@@ -337,11 +337,11 @@ rf69_set_tx_cfg(struct pi433_device *dev, struct pi433_tx_cfg *tx_cfg) }if (tx_cfg->enable_length_byte ==OPTION_ON ) { - ret =rf69_set_packet_format (dev->spi, packetLengthVar); + ret =rf69_set_packet_format (dev->spi, packet_length_var);if (ret <0 )return ret; }else { - ret =rf69_set_packet_format (dev->spi, packetLengthFix); + ret =rf69_set_packet_format (dev->spi, packet_length_fix);if (ret <0 )return ret; }
drivers/staging/pi433/rf69.c +4 -4
@@ -661,12 +661,12 @@ int rf69_set_sync_values(struct spi_device *spi, u8 sync_values[8])return retval; } -int rf69_set_packet_format (struct spi_device *spi,enum packetFormat packetFormat) +int rf69_set_packet_format (struct spi_device *spi,enum packet_format packet_format) { -switch (packetFormat) { -case packetLengthVar: +switch (packet_format) { +case packet_length_var:return rf69_set_bit (spi,REG_PACKETCONFIG1 ,MASK_PACKETCONFIG1_PAKET_FORMAT_VARIABLE ); -case packetLengthFix: +case packet_length_fix:return rf69_clear_bit (spi,REG_PACKETCONFIG1 ,MASK_PACKETCONFIG1_PAKET_FORMAT_VARIABLE );default :dev_dbg (&spi->dev,"set: illegal input param" );
drivers/staging/pi433/rf69.h +1 -1
@@ -50,7 +50,7 @@ int rf69_disable_sync(struct spi_device *spi);int rf69_set_fifo_fill_condition (struct spi_device *spi,enum fifo_fill_condition fifo_fill_condition);int rf69_set_sync_size (struct spi_device *spi,u8 sync_size);int rf69_set_sync_values (struct spi_device *spi,u8 sync_values[8 ]); -int rf69_set_packet_format (struct spi_device *spi,enum packetFormat packetFormat); +int rf69_set_packet_format (struct spi_device *spi,enum packet_format packet_format);int rf69_enable_crc (struct spi_device *spi);int rf69_disable_crc (struct spi_device *spi);int rf69_set_address_filtering (struct spi_device *spi,enum address_filtering address_filtering);
drivers/staging/pi433/rf69_enum.h +3 -3
@@ -118,9 +118,9 @@ enum fifo_fill_condition {always }; -enum packetFormat { - packetLengthFix, - packetLengthVar +enum packet_format { + packet_length_fix, + packet_length_var };enum tx_start_condition {
Signature · 6 lines
2.16.1 _______________________________________________ devel mailing list [email protected] http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
PATCH 2/6 staging: pi433: fix CamelCase for flag enum
Fixes checkpatch warnings:
CHECK: Avoid CamelCase: <modeSwitchCompleted>
CHECK: Avoid CamelCase: <readyToReceive>
CHECK: Avoid CamelCase: <readyToSend>
CHECK: Avoid CamelCase: <pllLocked>
CHECK: Avoid CamelCase: <rssiExceededThreshold>
CHECK: Avoid CamelCase: <syncAddressMatch>
CHECK: Avoid CamelCase: <packetSent>
CHECK: Avoid CamelCase: <crcOk>
CHECK: Avoid CamelCase: <batteryLow>
--- drivers/staging/pi433/pi433_if.c | 4 ++-- drivers/staging/pi433/rf69.c | 18 +++++++++--------- drivers/staging/pi433/rf69_enum.h | 18 +++++++++--------- 3 files changed, 20 insertions(+), 20 deletions(-)
drivers/staging/pi433/pi433_if.c +2 -2
@@ -443,7 +443,7 @@ pi433_receive(void *data)return retval;/* now check RSSI, if low wait for getting high (RSSI interrupt) */ -while (!rf69_get_flag (dev->spi, rssiExceededThreshold)) { +while (!rf69_get_flag (dev->spi, rssi_exceeded_threshold)) {/* allow tx to interrupt us while waiting for high RSSI */ dev->interrupt_rx_allowed = true;wake_up_interruptible (&dev->tx_wait_queue);
@@ -452,7 +452,7 @@ pi433_receive(void *data)dev_dbg (dev->dev,"rx: going to wait for high RSSI level" ); retval =wait_event_interruptible (dev->rx_wait_queue,rf69_get_flag (dev->spi, - rssiExceededThreshold)); + rssi_exceeded_threshold));if (retval)/* wait was interrupted */ goto abort; dev->interrupt_rx_allowed = false;
drivers/staging/pi433/rf69.c +9 -9
@@ -545,21 +545,21 @@ int rf69_set_dio_mapping(struct spi_device *spi, u8 DIONumber, u8 value)bool rf69_get_flag (struct spi_device *spi,enum flag flag) {switch (flag) { -case modeSwitchCompleted: +case mode_switch_completed:return (rf69_read_reg (spi,REG_IRQFLAGS1 ) &MASK_IRQFLAGS1_MODE_READY ); -case readyToReceive: +case ready_to_receive:return (rf69_read_reg (spi,REG_IRQFLAGS1 ) &MASK_IRQFLAGS1_RX_READY ); -case readyToSend: +case ready_to_send:return (rf69_read_reg (spi,REG_IRQFLAGS1 ) &MASK_IRQFLAGS1_TX_READY ); -case pllLocked: +case pll_locked:return (rf69_read_reg (spi,REG_IRQFLAGS1 ) &MASK_IRQFLAGS1_PLL_LOCK ); -case rssiExceededThreshold: +case rssi_exceeded_threshold:return (rf69_read_reg (spi,REG_IRQFLAGS1 ) &MASK_IRQFLAGS1_RSSI );case timeout:return (rf69_read_reg (spi,REG_IRQFLAGS1 ) &MASK_IRQFLAGS1_TIMEOUT );case automode:return (rf69_read_reg (spi,REG_IRQFLAGS1 ) &MASK_IRQFLAGS1_AUTOMODE ); -case syncAddressMatch: +case sync_address_match:return (rf69_read_reg (spi,REG_IRQFLAGS1 ) &MASK_IRQFLAGS1_SYNC_ADDRESS_MATCH );case fifo_full:return (rf69_read_reg (spi,REG_IRQFLAGS2 ) &MASK_IRQFLAGS2_FIFO_FULL );
@@ -571,13 +571,13 @@ bool rf69_get_flag(struct spi_device *spi, enum flag flag)return (rf69_read_reg (spi,REG_IRQFLAGS2 ) &MASK_IRQFLAGS2_FIFO_LEVEL );case fifo_overrun:return (rf69_read_reg (spi,REG_IRQFLAGS2 ) &MASK_IRQFLAGS2_FIFO_OVERRUN ); -case packetSent: +case packet_sent:return (rf69_read_reg (spi,REG_IRQFLAGS2 ) &MASK_IRQFLAGS2_PACKET_SENT );case payload_ready:return (rf69_read_reg (spi,REG_IRQFLAGS2 ) &MASK_IRQFLAGS2_PAYLOAD_READY ); -case crcOk: +case crc_ok:return (rf69_read_reg (spi,REG_IRQFLAGS2 ) &MASK_IRQFLAGS2_CRC_OK ); -case batteryLow: +case battery_low:return (rf69_read_reg (spi,REG_IRQFLAGS2 ) &MASK_IRQFLAGS2_LOW_BAT );default :return false; }
drivers/staging/pi433/rf69_enum.h +9 -9
@@ -94,23 +94,23 @@ enum threshold_decrement { };enum flag { - modeSwitchCompleted, - readyToReceive, - readyToSend, - pllLocked, - rssiExceededThreshold, + mode_switch_completed, + ready_to_receive, + ready_to_send, + pll_locked, + rssi_exceeded_threshold, timeout, automode, - syncAddressMatch, + sync_address_match, fifo_full,// fifo_not_empty, collision with next enum; replaced by following enum... fifo_empty, fifo_level_below_threshold, fifo_overrun, - packetSent, + packet_sent, payload_ready, - crcOk, - batteryLow + crc_ok, + battery_low };enum fifo_fill_condition {
Signature · 6 lines
2.16.1 _______________________________________________ devel mailing list [email protected] http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
PATCH 3/6 staging: pi433: fix CamelCase for afterSyncInterrupt
In reply to Valentin VidicFixes checkpatch warning:
CHECK: Avoid CamelCase: <afterSyncInterrupt>
--- drivers/staging/pi433/pi433_if.c | 2 +- drivers/staging/pi433/rf69.c | 2 +- drivers/staging/pi433/rf69_enum.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
drivers/staging/pi433/pi433_if.c +1 -1
@@ -209,7 +209,7 @@ rf69_set_rx_cfg(struct pi433_device *dev, struct pi433_rx_cfg *rx_cfg)return ret; ret =rf69_set_fifo_fill_condition (dev->spi, - afterSyncInterrupt); + after_sync_interrupt);if (ret <0 )return ret; }else {
drivers/staging/pi433/rf69.c +1 -1
@@ -625,7 +625,7 @@ int rf69_set_fifo_fill_condition(struct spi_device *spi, enum fifo_fill_conditioswitch (fifo_fill_condition) {case always:return rf69_set_bit (spi,REG_SYNC_CONFIG ,MASK_SYNC_CONFIG_FIFO_FILL_CONDITION ); -case afterSyncInterrupt: +case after_sync_interrupt:return rf69_clear_bit (spi,REG_SYNC_CONFIG ,MASK_SYNC_CONFIG_FIFO_FILL_CONDITION );default :dev_dbg (&spi->dev,"set: illegal input param" );
drivers/staging/pi433/rf69_enum.h +1 -1
@@ -114,7 +114,7 @@ enum flag { };enum fifo_fill_condition { - afterSyncInterrupt, + after_sync_interrupt, always };
Signature · 6 lines
2.16.1 _______________________________________________ devel mailing list [email protected] http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
PATCH 4/6 staging: pi433: fix CamelCase for address_filtering enum
In reply to Valentin VidicFixes checkpatch warnings:
CHECK: Avoid CamelCase: <filteringOff>
CHECK: Avoid CamelCase: <nodeAddress>
CHECK: Avoid CamelCase: <nodeOrBroadcastAddress>
--- drivers/staging/pi433/Documentation/pi433.txt | 12 ++++++------ drivers/staging/pi433/pi433_if.c | 6 +++--- drivers/staging/pi433/rf69.c | 6 +++--- drivers/staging/pi433/rf69_enum.h | 6 +++--- 4 files changed, 15 insertions(+), 15 deletions(-)
drivers/staging/pi433/Documentation/pi433.txt +6 -6
@@ -232,12 +232,12 @@ rf params: amount of bytes that were requested by the read request. Attention: should be used in combination with sync, only enable_address_filtering; - filteringOff - no address filtering will take place - nodeAddress - all telegrams, not matching the node - address will be internally discarded - nodeOrBroadcastAddress - all telegrams, neither matching the - node, nor the broadcast address will - be internally discarded + filtering_off - no address filtering will take place + node_address - all telegrams, not matching the node + address will be internally discarded + node_or_broadcast_address - all telegrams, neither matching the + node, nor the broadcast address will + be internally discarded Attention: Sync option must be enabled in order to use this feature enable_crc optionOn - a crc will be calculated over the payload of
drivers/staging/pi433/pi433_if.c +3 -3
@@ -257,7 +257,7 @@ rf69_set_rx_cfg(struct pi433_device *dev, struct pi433_rx_cfg *rx_cfg) payload_length = rx_cfg->fixed_message_length;if (rx_cfg->enable_length_byte ==OPTION_ON ) payload_length++; -if (rx_cfg->enable_address_filtering != filteringOff) +if (rx_cfg->enable_address_filtering != filtering_off) payload_length++; ret =rf69_set_payload_length (dev->spi, payload_length);if (ret <0 )
@@ -274,7 +274,7 @@ rf69_set_rx_cfg(struct pi433_device *dev, struct pi433_rx_cfg *rx_cfg)if (ret <0 )return ret; } -if (rx_cfg->enable_address_filtering != filteringOff) { +if (rx_cfg->enable_address_filtering != filtering_off) { ret =rf69_set_node_address (dev->spi, rx_cfg->node_address);if (ret <0 )return ret;
@@ -502,7 +502,7 @@ pi433_receive(void *data) }/* address byte enabled? */ -if (dev->rx_cfg.enable_address_filtering != filteringOff) { +if (dev->rx_cfg.enable_address_filtering != filtering_off) {u8 dummy; bytes_total--;
drivers/staging/pi433/rf69.c +3 -3
@@ -687,11 +687,11 @@ int rf69_disable_crc(struct spi_device *spi)int rf69_set_address_filtering (struct spi_device *spi,enum address_filtering address_filtering) {switch (address_filtering) { -case filteringOff: +case filtering_off:return rf69_read_mod_write (spi,REG_PACKETCONFIG1 ,MASK_PACKETCONFIG1_ADDRESSFILTERING ,PACKETCONFIG1_ADDRESSFILTERING_OFF ); -case nodeAddress: +case node_address:return rf69_read_mod_write (spi,REG_PACKETCONFIG1 ,MASK_PACKETCONFIG1_ADDRESSFILTERING ,PACKETCONFIG1_ADDRESSFILTERING_NODE ); -case nodeOrBroadcastAddress: +case node_or_broadcast_address:return rf69_read_mod_write (spi,REG_PACKETCONFIG1 ,MASK_PACKETCONFIG1_ADDRESSFILTERING ,PACKETCONFIG1_ADDRESSFILTERING_NODEBROADCAST );default :dev_dbg (&spi->dev,"set: illegal input param" );
drivers/staging/pi433/rf69_enum.h +3 -3
@@ -129,9 +129,9 @@ enum tx_start_condition { };enum address_filtering { - filteringOff, - nodeAddress, - nodeOrBroadcastAddress + filtering_off, + node_address, + node_or_broadcast_address };enum dagc {
Signature · 6 lines
2.16.1 _______________________________________________ devel mailing list [email protected] http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
PATCH 5/6 staging: pi433: fix CamelCase for Address variables
In reply to Valentin VidicFixes checkpatch warnings:
CHECK: Avoid CamelCase: <nodeAddress>
CHECK: Avoid CamelCase: <broadcastAddress>
--- drivers/staging/pi433/rf69.c | 8 ++++---- drivers/staging/pi433/rf69.h | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-)
drivers/staging/pi433/rf69.c +4 -4
@@ -704,14 +704,14 @@ int rf69_set_payload_length(struct spi_device *spi, u8 payload_length)return rf69_write_reg (spi,REG_PAYLOAD_LENGTH , payload_length); } -int rf69_set_node_address (struct spi_device *spi,u8 nodeAddress) +int rf69_set_node_address (struct spi_device *spi,u8 node_address) { -return rf69_write_reg (spi,REG_NODEADRS , nodeAddress); +return rf69_write_reg (spi,REG_NODEADRS , node_address); } -int rf69_set_broadcast_address (struct spi_device *spi,u8 broadcastAddress) +int rf69_set_broadcast_address (struct spi_device *spi,u8 broadcast_address) { -return rf69_write_reg (spi,REG_BROADCASTADRS , broadcastAddress); +return rf69_write_reg (spi,REG_BROADCASTADRS , broadcast_address); }int rf69_set_tx_start_condition (struct spi_device *spi,enum tx_start_condition tx_start_condition)
drivers/staging/pi433/rf69.h +2 -2
@@ -55,8 +55,8 @@ int rf69_enable_crc(struct spi_device *spi);int rf69_disable_crc (struct spi_device *spi);int rf69_set_address_filtering (struct spi_device *spi,enum address_filtering address_filtering);int rf69_set_payload_length (struct spi_device *spi,u8 payload_length); -int rf69_set_node_address (struct spi_device *spi,u8 nodeAddress); -int rf69_set_broadcast_address (struct spi_device *spi,u8 broadcastAddress); +int rf69_set_node_address (struct spi_device *spi,u8 node_address); +int rf69_set_broadcast_address (struct spi_device *spi,u8 broadcast_address);int rf69_set_tx_start_condition (struct spi_device *spi,enum tx_start_condition tx_start_condition);int rf69_set_fifo_threshold (struct spi_device *spi,u8 threshold);int rf69_set_dagc (struct spi_device *spi,enum dagc dagc);
Signature · 6 lines
2.16.1 _______________________________________________ devel mailing list [email protected] http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
PATCH 6/6 staging: pi433: fix CamelCase for paRamp enum
In reply to Valentin VidicFixes checkpatch warning:
CHECK: Avoid CamelCase: <paRamp>
--- drivers/staging/pi433/Documentation/pi433.txt | 2 +- drivers/staging/pi433/pi433_if.h | 2 +- drivers/staging/pi433/rf69.c | 4 ++-- drivers/staging/pi433/rf69.h | 2 +- drivers/staging/pi433/rf69_enum.h | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-)
drivers/staging/pi433/Documentation/pi433.txt +1 -1
@@ -92,7 +92,7 @@ rf params: shaping0_3 - gauss filter with BT 0.3 (FSK only) shapingBR - filter cut off at BR (OOK only) shaping2BR - filter cut off at 2*BR (OOK only) - paRamp (FSK only) + pa_ramp (FSK only) ramp3400 - amp ramps up in 3.4ms ramp2000 - amp ramps up in 2.0ms ramp1000 - amp ramps up in 1ms
drivers/staging/pi433/pi433_if.h +1 -1
@@ -67,7 +67,7 @@ struct pi433_tx_cfg {enum modulation modulation;enum mod_shaping mod_shaping; -enum paRamp pa_ramp; +enum pa_ramp pa_ramp;enum tx_start_condition tx_start_condition;
drivers/staging/pi433/rf69.c +2 -2
@@ -345,9 +345,9 @@ int rf69_set_output_power_level(struct spi_device *spi, u8 power_level)return rf69_read_mod_write (spi,REG_PALEVEL ,MASK_PALEVEL_OUTPUT_POWER , power_level); } -int rf69_set_pa_ramp (struct spi_device *spi,enum paRamp paRamp) +int rf69_set_pa_ramp (struct spi_device *spi,enum pa_ramp pa_ramp) { -switch (paRamp) { +switch (pa_ramp) {case ramp3400:return rf69_write_reg (spi,REG_PARAMP ,PARAMP_3400 );case ramp2000:
drivers/staging/pi433/rf69.h +1 -1
@@ -35,7 +35,7 @@ int rf69_set_frequency(struct spi_device *spi, u32 frequency);int rf69_enable_amplifier (struct spi_device *spi,u8 amplifier_mask);int rf69_disable_amplifier (struct spi_device *spi,u8 amplifier_mask);int rf69_set_output_power_level (struct spi_device *spi,u8 power_level); -int rf69_set_pa_ramp (struct spi_device *spi,enum paRamp paRamp); +int rf69_set_pa_ramp (struct spi_device *spi,enum pa_ramp pa_ramp);int rf69_set_antenna_impedance (struct spi_device *spi,enum antenna_impedance antenna_impedance);int rf69_set_lna_gain (struct spi_device *spi,enum lnaGain lnaGain);int rf69_set_bandwidth (struct spi_device *spi,enum mantisse mantisse,u8 exponent);
drivers/staging/pi433/rf69_enum.h +1 -1
@@ -41,7 +41,7 @@ enum mod_shaping {SHAPING_2BR }; -enum paRamp { +enum pa_ramp { ramp3400, ramp2000, ramp1000,
Signature · 6 lines
2.16.1 _______________________________________________ devel mailing list [email protected] http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel