From: Lars-Peter Clausen Date: Wed, 25 Apr 2012 07:44:57 +0000 (+0200) Subject: staging:iio:dac:ad5446: Remove duplicated chip_info entries X-Git-Tag: v3.5-rc1~145^2~229^2~72 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=11a7df4890d38886fc7f3eb993a5b3038c0a5527;p=profile%2Fivi%2Fkernel-adaptation-intel-automotive.git staging:iio:dac:ad5446: Remove duplicated chip_info entries 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 Acked-by: Jonathan Cameron Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/iio/dac/ad5446.c b/drivers/staging/iio/dac/ad5446.c index 659d083..00eece4 100644 --- a/drivers/staging/iio/dac/ad5446.c +++ b/drivers/staging/iio/dac/ad5446.c @@ -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, @@ -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}, diff --git a/drivers/staging/iio/dac/ad5446.h b/drivers/staging/iio/dac/ad5446.h index 29aa0dc..0651816 100644 --- a/drivers/staging/iio/dac/ad5446.h +++ b/drivers/staging/iio/dac/ad5446.h @@ -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,