staging: pi433: Rename enum modShaping in rf69_enum.h

Renames enum modShaping and its values to get rid of checkpatch.pl
warnings: "Avoid CamelCase: <modShaping>".

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 4f6830f369e9fe1eb0e2322bc06b80c87dc1d596..2ae19ac565d19381b880d7a07957ca553c62b8c2 100644 (file)
--- a/drivers/staging/pi433/pi433_if.c
+++ b/drivers/staging/pi433/pi433_if.c
@@ -260,7 +260,7 @@ rf69_set_tx_cfg(struct pi433_device *dev, struct pi433_tx_cfg *tx_cfg)
        SET_CHECKED(rf69_set_modulation (dev->spi, tx_cfg->modulation));
        SET_CHECKED(rf69_set_deviation  (dev->spi, tx_cfg->dev_frequency));
        SET_CHECKED(rf69_set_pa_ramp    (dev->spi, tx_cfg->pa_ramp));
-       SET_CHECKED(rf69_set_modulation_shaping(dev->spi, tx_cfg->modShaping));
+       SET_CHECKED(rf69_set_modulation_shaping(dev->spi, tx_cfg->mod_shaping));
        SET_CHECKED(rf69_set_tx_start_condition(dev->spi, tx_cfg->tx_start_condition));
 
        /* packet format enable */

diff --git a/drivers/staging/pi433/pi433_if.h b/drivers/staging/pi433/pi433_if.h
index 34ff0d4807bdbbc0ca147a6f9f30ee3cfee7e3ab..bcfe29840889987b83c011c59a399e4aeaf9f243 100644 (file)
--- a/drivers/staging/pi433/pi433_if.h
+++ b/drivers/staging/pi433/pi433_if.h
@@ -63,7 +63,7 @@ struct pi433_tx_cfg {
        __u16                   bit_rate;
        __u32                   dev_frequency;
        enum modulation         modulation;
-       enum modShaping         modShaping;
+       enum mod_shaping        mod_shaping;
 
        enum paRamp             pa_ramp;
 

diff --git a/drivers/staging/pi433/rf69.c b/drivers/staging/pi433/rf69.c
index 45d2f5a930eb146d1f7cf491acbcb06fdb9432e9..c97fd8031ecbebf21eddfdbe37466ad782f050b0 100644 (file)
--- a/drivers/staging/pi433/rf69.c
+++ b/drivers/staging/pi433/rf69.c
@@ -133,27 +133,28 @@ enum modulation rf69_get_modulation(struct spi_device *spi)
        }
 }
 
-int rf69_set_modulation_shaping(struct spi_device *spi, enum modShaping modShaping)
+int rf69_set_modulation_shaping(struct spi_device *spi,
+                               enum mod_shaping mod_shaping)
 {
        #ifdef DEBUG
                dev_dbg(&spi->dev, "set: mod shaping");
        #endif
 
        if (rf69_get_modulation(spi) == FSK) {
-               switch (modShaping) {
-               case shapingOff: return rf69_read_mod_write(spi, REG_DATAMODUL, MASK_DATAMODUL_MODULATION_SHAPE, DATAMODUL_MODULATION_SHAPE_NONE);
-               case shaping1_0: return rf69_read_mod_write(spi, REG_DATAMODUL, MASK_DATAMODUL_MODULATION_SHAPE, DATAMODUL_MODULATION_SHAPE_1_0);
-               case shaping0_5: return rf69_read_mod_write(spi, REG_DATAMODUL, MASK_DATAMODUL_MODULATION_SHAPE, DATAMODUL_MODULATION_SHAPE_0_3);
-               case shaping0_3: return rf69_read_mod_write(spi, REG_DATAMODUL, MASK_DATAMODUL_MODULATION_SHAPE, DATAMODUL_MODULATION_SHAPE_0_5);
+               switch (mod_shaping) {
+               case SHAPING_OFF: return rf69_read_mod_write(spi, REG_DATAMODUL, MASK_DATAMODUL_MODULATION_SHAPE, DATAMODUL_MODULATION_SHAPE_NONE);
+               case SHAPING_1_0: return rf69_read_mod_write(spi, REG_DATAMODUL, MASK_DATAMODUL_MODULATION_SHAPE, DATAMODUL_MODULATION_SHAPE_1_0);
+               case SHAPING_0_5: return rf69_read_mod_write(spi, REG_DATAMODUL, MASK_DATAMODUL_MODULATION_SHAPE, DATAMODUL_MODULATION_SHAPE_0_3);
+               case SHAPING_0_3: return rf69_read_mod_write(spi, REG_DATAMODUL, MASK_DATAMODUL_MODULATION_SHAPE, DATAMODUL_MODULATION_SHAPE_0_5);
                default:
                        dev_dbg(&spi->dev, "set: illegal input param");
                        return -EINVAL;
                }
        } else {
-               switch (modShaping) {
-               case shapingOff: return rf69_read_mod_write(spi, REG_DATAMODUL, MASK_DATAMODUL_MODULATION_SHAPE, DATAMODUL_MODULATION_SHAPE_NONE);
-               case shapingBR:  return rf69_read_mod_write(spi, REG_DATAMODUL, MASK_DATAMODUL_MODULATION_SHAPE, DATAMODUL_MODULATION_SHAPE_BR);
-               case shaping2BR: return rf69_read_mod_write(spi, REG_DATAMODUL, MASK_DATAMODUL_MODULATION_SHAPE, DATAMODUL_MODULATION_SHAPE_2BR);
+               switch (mod_shaping) {
+               case SHAPING_OFF: return rf69_read_mod_write(spi, REG_DATAMODUL, MASK_DATAMODUL_MODULATION_SHAPE, DATAMODUL_MODULATION_SHAPE_NONE);
+               case SHAPING_BR:  return rf69_read_mod_write(spi, REG_DATAMODUL, MASK_DATAMODUL_MODULATION_SHAPE, DATAMODUL_MODULATION_SHAPE_BR);
+               case SHAPING_2BR: return rf69_read_mod_write(spi, REG_DATAMODUL, MASK_DATAMODUL_MODULATION_SHAPE, DATAMODUL_MODULATION_SHAPE_2BR);
                default:
                        dev_dbg(&spi->dev, "set: illegal input param");
                        return -EINVAL;

diff --git a/drivers/staging/pi433/rf69.h b/drivers/staging/pi433/rf69.h
index 12c2e106785e70a649f7d640923dd9d441cf9d13..1cb6db33d6fede91c68fe3ae1818a12470a2c8b6 100644 (file)
--- a/drivers/staging/pi433/rf69.h
+++ b/drivers/staging/pi433/rf69.h
@@ -29,7 +29,7 @@ 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_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 modShaping modShaping);
+int rf69_set_modulation_shaping(struct spi_device *spi, enum mod_shaping mod_shaping);
 int rf69_set_bit_rate(struct spi_device *spi, u16 bitRate);
 int rf69_set_deviation(struct spi_device *spi, u32 deviation);
 int rf69_set_frequency(struct spi_device *spi, u32 frequency);

diff --git a/drivers/staging/pi433/rf69_enum.h b/drivers/staging/pi433/rf69_enum.h
index 5247e9269de997e7be91e16c06704f9dfe56cbae..97f615effca33f25d429af7dac4d8b4429ca9f84 100644 (file)
--- a/drivers/staging/pi433/rf69_enum.h
+++ b/drivers/staging/pi433/rf69_enum.h
@@ -42,13 +42,13 @@ enum modulation {
        FSK
 };
 
-enum modShaping {
-       shapingOff,
-       shaping1_0,
-       shaping0_5,
-       shaping0_3,
-       shapingBR,
-       shaping2BR
+enum mod_shaping {
+       SHAPING_OFF,
+       SHAPING_1_0,
+       SHAPING_0_5,
+       SHAPING_0_3,
+       SHAPING_BR,
+       SHAPING_2BR
 };
 
 enum paRamp {