On 05/21/2012 12:43 PM, Lars-Peter Clausen wrote:
> The header for this driver contains some private structs and defines, which do
> not have to be shared between multiple source files, as well as the platform
> data struct for this driver, which has to be shared with other source files.
> Since there is no need to expose those private structs and defines move them to
> the source file.
Sensible. Minor suggestion inline.
>
> Signed-off-by: Lars-Peter Clausen <lars@xxxxxxxxxx>
Acked-by: Jonathan Cameron <jic23@xxxxxxxxxx>
> ---
> drivers/staging/iio/dac/ad5504.c | 45 ++++++++++++++++++++++++++++++++++++++
> drivers/staging/iio/dac/ad5504.h | 45 --------------------------------------
> 2 files changed, 45 insertions(+), 45 deletions(-)
>
> diff --git a/drivers/staging/iio/dac/ad5504.c b/drivers/staging/iio/dac/ad5504.c
> index cd754d2..012c187 100644
> --- a/drivers/staging/iio/dac/ad5504.c
> +++ b/drivers/staging/iio/dac/ad5504.c
> @@ -22,6 +22,51 @@
>
> #include "ad5504.h"
>
> +#define AD5505_BITS 12
> +#define AD5504_RES_MASK ((1 << (AD5505_BITS)) - 1)
> +
> +#define AD5504_CMD_READ (1 << 15)
> +#define AD5504_CMD_WRITE (0 << 15)
> +#define AD5504_ADDR(addr) ((addr) << 12)
> +
> +/* Registers */
> +#define AD5504_ADDR_NOOP 0
> +#define AD5504_ADDR_DAC(x) ((x) + 1)
> +#define AD5504_ADDR_ALL_DAC 5
> +#define AD5504_ADDR_CTRL 7
> +
> +/* Control Register */
> +#define AD5504_DAC_PWR(ch) ((ch) << 2)
> +#define AD5504_DAC_PWRDWN_MODE(mode) ((mode) << 6)
> +#define AD5504_DAC_PWRDN_20K 0
> +#define AD5504_DAC_PWRDN_3STATE 1
> +
> +/**
> + * struct ad5446_state - driver instance specific data
> + * @us: spi_device
> + * @reg: supply regulator
> + * @vref_mv: actual reference voltage used
> + * @pwr_down_mask power down mask
> + * @pwr_down_mode current power down mode
> + */
If we are being fussy, isn't convention no blank line here?
> +
> +struct ad5504_state {
> + struct spi_device *spi;
> + struct regulator *reg;
> + unsigned short vref_mv;
> + unsigned pwr_down_mask;
> + unsigned pwr_down_mode;
> +};
> +
> +/**
> + * ad5504_supported_device_ids:
> + */
> +
> +enum ad5504_supported_device_ids {
> + ID_AD5504,
> + ID_AD5501,
> +};
> +
> static int ad5504_spi_write(struct spi_device *spi, u8 addr, u16 val)
> {
> u16 tmp = cpu_to_be16(AD5504_CMD_WRITE |
> diff --git a/drivers/staging/iio/dac/ad5504.h b/drivers/staging/iio/dac/ad5504.h
> index afe0952..d4980bf 100644
> --- a/drivers/staging/iio/dac/ad5504.h
> +++ b/drivers/staging/iio/dac/ad5504.h
> @@ -9,25 +9,6 @@
> #ifndef SPI_AD5504_H_
> #define SPI_AD5504_H_
>
> -#define AD5505_BITS 12
> -#define AD5504_RES_MASK ((1 << (AD5505_BITS)) - 1)
> -
> -#define AD5504_CMD_READ (1 << 15)
> -#define AD5504_CMD_WRITE (0 << 15)
> -#define AD5504_ADDR(addr) ((addr) << 12)
> -
> -/* Registers */
> -#define AD5504_ADDR_NOOP 0
> -#define AD5504_ADDR_DAC(x) ((x) + 1)
> -#define AD5504_ADDR_ALL_DAC 5
> -#define AD5504_ADDR_CTRL 7
> -
> -/* Control Register */
> -#define AD5504_DAC_PWR(ch) ((ch) << 2)
> -#define AD5504_DAC_PWRDWN_MODE(mode) ((mode) << 6)
> -#define AD5504_DAC_PWRDN_20K 0
> -#define AD5504_DAC_PWRDN_3STATE 1
> -
> /*
> * TODO: struct ad5504_platform_data needs to go into include/linux/iio
> */
> @@ -36,30 +17,4 @@ struct ad5504_platform_data {
> u16 vref_mv;
> };
>
> -/**
> - * struct ad5446_state - driver instance specific data
> - * @us: spi_device
> - * @reg: supply regulator
> - * @vref_mv: actual reference voltage used
> - * @pwr_down_mask power down mask
> - * @pwr_down_mode current power down mode
> - */
> -
> -struct ad5504_state {
> - struct spi_device *spi;
> - struct regulator *reg;
> - unsigned short vref_mv;
> - unsigned pwr_down_mask;
> - unsigned pwr_down_mode;
> -};
> -
> -/**
> - * ad5504_supported_device_ids:
> - */
> -
> -enum ad5504_supported_device_ids {
> - ID_AD5504,
> - ID_AD5501,
> -};
> -
> #endif /* SPI_AD5504_H_ */
--
To unsubscribe from this list: send the line "unsubscribe linux-iio" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
