On 04/23/2012 06:51 PM, Lars-Peter Clausen wrote:
> There are three identical chip_info entries. Remove two of them and use the id
> of the remaining entry for all three device table entries.
>
> Signed-off-by: Lars-Peter Clausen <lars@xxxxxxxxxx>
Acked-by: Jonathan Cameron <jic23@xxxxxxxxxx>
> ---
> drivers/staging/iio/dac/ad5446.c | 12 ++----------
> drivers/staging/iio/dac/ad5446.h | 2 --
> 2 files changed, 2 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/staging/iio/dac/ad5446.c b/drivers/staging/iio/dac/ad5446.c
> index 9d9a452..693485a 100644
> --- a/drivers/staging/iio/dac/ad5446.c
> +++ b/drivers/staging/iio/dac/ad5446.c
> @@ -176,14 +176,6 @@ static const struct ad5446_chip_info ad5446_chip_info_tbl[] = {
> .channel = AD5446_CHANNEL(16, 16, 0),
> .store_sample = ad5542_store_sample,
> },
> - [ID_AD5542A] = {
> - .channel = AD5446_CHANNEL(16, 16, 0),
> - .store_sample = ad5542_store_sample,
> - },
> - [ID_AD5543] = {
> - .channel = AD5446_CHANNEL(16, 16, 0),
> - .store_sample = ad5542_store_sample,
> - },
> [ID_AD5512A] = {
> .channel = AD5446_CHANNEL(12, 16, 4),
> .store_sample = ad5542_store_sample,
> @@ -400,8 +392,8 @@ static const struct spi_device_id ad5446_id[] = {
> {"ad5446", ID_AD5446},
> {"ad5512a", ID_AD5512A},
> {"ad5541a", ID_AD5541A},
> - {"ad5542a", ID_AD5542A},
> - {"ad5543", ID_AD5543},
> + {"ad5542a", ID_AD5541A}, /* ad5541a and ad5542a are compatible */
> + {"ad5543", ID_AD5541A}, /* ad5541a and ad5543 are compatible */
> {"ad5553", ID_AD5553},
> {"ad5601", ID_AD5601},
> {"ad5611", ID_AD5611},
> diff --git a/drivers/staging/iio/dac/ad5446.h b/drivers/staging/iio/dac/ad5446.h
> index 72ad07f..264df1e 100644
> --- a/drivers/staging/iio/dac/ad5446.h
> +++ b/drivers/staging/iio/dac/ad5446.h
> @@ -83,8 +83,6 @@ enum ad5446_supported_device_ids {
> ID_AD5444,
> ID_AD5446,
> ID_AD5541A,
> - ID_AD5542A,
> - ID_AD5543,
> ID_AD5512A,
> ID_AD5553,
> ID_AD5601,
--
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
