Skip to content

Commit

Permalink
staging:iio:dac:ad5446: Remove duplicated chip_info entries
Browse files Browse the repository at this point in the history
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@metafoo.de>
Acked-by: Jonathan Cameron <jic23@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Lars-Peter Clausen authored and Greg Kroah-Hartman committed Apr 25, 2012
1 parent 4e5d3f9 commit 11a7df4
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 12 deletions.
12 changes: 2 additions & 10 deletions drivers/staging/iio/dac/ad5446.c
Original file line number Diff line number Diff line change
Expand Up @@ -174,14 +174,6 @@ static const struct ad5446_chip_info ad5446_chip_info_tbl[] = {
.channel = AD5446_CHANNEL(16, 16, 0),
.store_sample = ad5446_store_sample,
},
[ID_AD5542A] = {
.channel = AD5446_CHANNEL(16, 16, 0),
.store_sample = ad5446_store_sample,
},
[ID_AD5543] = {
.channel = AD5446_CHANNEL(16, 16, 0),
.store_sample = ad5446_store_sample,
},
[ID_AD5512A] = {
.channel = AD5446_CHANNEL(12, 16, 4),
.store_sample = ad5446_store_sample,
Expand Down Expand Up @@ -389,8 +381,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},
Expand Down
2 changes: 0 additions & 2 deletions drivers/staging/iio/dac/ad5446.h
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,6 @@ enum ad5446_supported_device_ids {
ID_AD5444,
ID_AD5446,
ID_AD5541A,
ID_AD5542A,
ID_AD5543,
ID_AD5512A,
ID_AD5553,
ID_AD5601,
Expand Down

0 comments on commit 11a7df4

Please sign in to comment.