staging: pi433: Remove enum data_mode

Call rf69_set_data_mode with DATAMODUL_MODE value directly.

Signed-off-by: Simon Sandström <simon@nikanor.nu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/pi433/pi433_if.c b/drivers/staging/pi433/pi433_if.c
index fb500d062df8760d9bb4853dacbbf83e8e082ec4..3b4170b9ba94f8415dcfc3c229e7a07778be65a8 100644 (file)
--- a/drivers/staging/pi433/pi433_if.c
+++ b/drivers/staging/pi433/pi433_if.c
@@ -1125,7 +1125,7 @@ static int pi433_probe(struct spi_device *spi)
 
        /* setup the radio module */
        SET_CHECKED(rf69_set_mode               (spi, standby));
-       SET_CHECKED(rf69_set_data_mode          (spi, packet));
+       SET_CHECKED(rf69_set_data_mode          (spi, DATAMODUL_MODE_PACKET));
        SET_CHECKED(rf69_set_amplifier_0        (spi, OPTION_ON));
        SET_CHECKED(rf69_set_amplifier_1        (spi, OPTION_OFF));
        SET_CHECKED(rf69_set_amplifier_2        (spi, OPTION_OFF));

diff --git a/drivers/staging/pi433/rf69.c b/drivers/staging/pi433/rf69.c
index 12a1091d99366b87f99ab69e2921fada6493f8e9..9f2ffb89033e77a28d8cd66deff2da2ffc70ee17 100644 (file)
--- a/drivers/staging/pi433/rf69.c
+++ b/drivers/staging/pi433/rf69.c
@@ -85,20 +85,9 @@ int rf69_set_mode(struct spi_device *spi, enum mode mode)
 
 }
 
-int rf69_set_data_mode(struct spi_device *spi, enum dataMode dataMode)
+int rf69_set_data_mode(struct spi_device *spi, u8 data_mode)
 {
-       #ifdef DEBUG
-               dev_dbg(&spi->dev, "set: data mode");
-       #endif
-
-       switch (dataMode) {
-       case packet:            return rf69_read_mod_write(spi, REG_DATAMODUL, MASK_DATAMODUL_MODE, DATAMODUL_MODE_PACKET);
-       case continuous:        return rf69_read_mod_write(spi, REG_DATAMODUL, MASK_DATAMODUL_MODE, DATAMODUL_MODE_CONTINUOUS);
-       case continuousNoSync:  return rf69_read_mod_write(spi, REG_DATAMODUL, MASK_DATAMODUL_MODE, DATAMODUL_MODE_CONTINUOUS_NOSYNC);
-       default:
-               dev_dbg(&spi->dev, "set: illegal input param");
-               return -EINVAL;
-       }
+       return rf69_read_mod_write(spi, REG_DATAMODUL, MASK_DATAMODUL_MODE, data_mode);
 }
 
 int rf69_set_modulation(struct spi_device *spi, enum modulation modulation)

diff --git a/drivers/staging/pi433/rf69.h b/drivers/staging/pi433/rf69.h
index 177223451c87131bd78f476a69132189000eb77a..18296b4502f3b7aa6012988a603705476aa78149 100644 (file)
--- a/drivers/staging/pi433/rf69.h
+++ b/drivers/staging/pi433/rf69.h
@@ -26,7 +26,7 @@
 #define FIFO_THRESHOLD 15              /* in byte */
 
 int rf69_set_mode(struct spi_device *spi, enum mode mode);
-int rf69_set_data_mode(struct spi_device *spi, enum dataMode dataMode);
+int rf69_set_data_mode(struct spi_device *spi, u8 data_mode);
 int rf69_set_modulation(struct spi_device *spi, enum modulation modulation);
 enum modulation rf69_get_modulation(struct spi_device *spi);
 int rf69_set_modulation_shaping(struct spi_device *spi, enum mod_shaping mod_shaping);

diff --git a/drivers/staging/pi433/rf69_enum.h b/drivers/staging/pi433/rf69_enum.h
index 97f615effca33f25d429af7dac4d8b4429ca9f84..b0715b4eb6ac560b132a58a1c6d44b4cbae22ebf 100644 (file)
--- a/drivers/staging/pi433/rf69_enum.h
+++ b/drivers/staging/pi433/rf69_enum.h
@@ -31,12 +31,6 @@ enum mode {
        receive
 };
 
-enum dataMode {
-       packet,
-       continuous,
-       continuousNoSync
-};
-
 enum modulation {
        OOK,
        FSK