Commit 9b65e910 authored by Simon Sandström's avatar Simon Sandström Committed by Greg Kroah-Hartman

staging: pi433: Add spaces around & and + operator

Fixes checkpatch warning: "spaces preferred around that '&'".
Signed-off-by: default avatarSimon Sandström <simon@nikanor.nu>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 02dd7bc2
...@@ -82,7 +82,6 @@ int rf69_set_mode(struct spi_device *spi, enum mode mode) ...@@ -82,7 +82,6 @@ int rf69_set_mode(struct spi_device *spi, enum mode mode)
// we are using packet mode, so this check is not really needed // we are using packet mode, so this check is not really needed
// but waiting for mode ready is necessary when going from sleep because the FIFO may not be immediately available from previous mode // but waiting for mode ready is necessary when going from sleep because the FIFO may not be immediately available from previous mode
//while (_mode == RF69_MODE_SLEEP && (READ_REG(REG_IRQFLAGS1) & RF_IRQFLAGS1_MODEREADY) == 0x00); // Wait for ModeReady //while (_mode == RF69_MODE_SLEEP && (READ_REG(REG_IRQFLAGS1) & RF_IRQFLAGS1_MODEREADY) == 0x00); // Wait for ModeReady
} }
int rf69_set_data_mode(struct spi_device *spi, u8 data_mode) int rf69_set_data_mode(struct spi_device *spi, u8 data_mode)
...@@ -173,8 +172,8 @@ int rf69_set_bit_rate(struct spi_device *spi, u16 bitRate) ...@@ -173,8 +172,8 @@ int rf69_set_bit_rate(struct spi_device *spi, u16 bitRate)
// calculate reg settings // calculate reg settings
bitRate_reg = (F_OSC / bitRate); bitRate_reg = (F_OSC / bitRate);
msb = (bitRate_reg&0xff00) >> 8; msb = (bitRate_reg & 0xff00) >> 8;
lsb = (bitRate_reg&0xff); lsb = (bitRate_reg & 0xff);
// transmit to RF 69 // transmit to RF 69
retval = rf69_write_reg(spi, REG_BITRATE_MSB, msb); retval = rf69_write_reg(spi, REG_BITRATE_MSB, msb);
...@@ -214,8 +213,8 @@ int rf69_set_deviation(struct spi_device *spi, u32 deviation) ...@@ -214,8 +213,8 @@ int rf69_set_deviation(struct spi_device *spi, u32 deviation)
f_reg = deviation * factor; f_reg = deviation * factor;
do_div(f_reg, f_step); do_div(f_reg, f_step);
msb = (f_reg&0xff00) >> 8; msb = (f_reg & 0xff00) >> 8;
lsb = (f_reg&0xff); lsb = (f_reg & 0xff);
// check msb // check msb
if (msb & ~FDEVMASB_MASK) { if (msb & ~FDEVMASB_MASK) {
...@@ -264,9 +263,9 @@ int rf69_set_frequency(struct spi_device *spi, u32 frequency) ...@@ -264,9 +263,9 @@ int rf69_set_frequency(struct spi_device *spi, u32 frequency)
f_reg = frequency * factor; f_reg = frequency * factor;
do_div(f_reg, f_step); do_div(f_reg, f_step);
msb = (f_reg&0xff0000) >> 16; msb = (f_reg & 0xff0000) >> 16;
mid = (f_reg&0xff00) >> 8; mid = (f_reg & 0xff00) >> 8;
lsb = (f_reg&0xff); lsb = (f_reg & 0xff);
// write to chip // write to chip
retval = rf69_write_reg(spi, REG_FRF_MSB, msb); retval = rf69_write_reg(spi, REG_FRF_MSB, msb);
...@@ -686,8 +685,8 @@ int rf69_set_preamble_length(struct spi_device *spi, u16 preambleLength) ...@@ -686,8 +685,8 @@ int rf69_set_preamble_length(struct spi_device *spi, u16 preambleLength)
/* no value check needed - u16 exactly matches register size */ /* no value check needed - u16 exactly matches register size */
/* calculate reg settings */ /* calculate reg settings */
msb = (preambleLength&0xff00) >> 8; msb = (preambleLength & 0xff00) >> 8;
lsb = (preambleLength&0xff); lsb = (preambleLength & 0xff);
/* transmit to chip */ /* transmit to chip */
retval = rf69_write_reg(spi, REG_PREAMBLE_MSB, msb); retval = rf69_write_reg(spi, REG_PREAMBLE_MSB, msb);
...@@ -931,14 +930,14 @@ int rf69_read_fifo (struct spi_device *spi, u8 *buffer, unsigned int size) ...@@ -931,14 +930,14 @@ int rf69_read_fifo (struct spi_device *spi, u8 *buffer, unsigned int size)
memset(&transfer, 0, sizeof(transfer)); memset(&transfer, 0, sizeof(transfer));
transfer.tx_buf = local_buffer; transfer.tx_buf = local_buffer;
transfer.rx_buf = local_buffer; transfer.rx_buf = local_buffer;
transfer.len = size+1; transfer.len = size + 1;
retval = spi_sync_transfer(spi, &transfer, 1); retval = spi_sync_transfer(spi, &transfer, 1);
#ifdef DEBUG_FIFO_ACCESS #ifdef DEBUG_FIFO_ACCESS
for (i = 0; i < size; i++) for (i = 0; i < size; i++)
dev_dbg(&spi->dev, "%d - 0x%x\n", i, local_buffer[i+1]); dev_dbg(&spi->dev, "%d - 0x%x\n", i, local_buffer[i + 1]);
#endif #endif
memcpy(buffer, &local_buffer[1], size); memcpy(buffer, &local_buffer[1], size);
......
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