Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 11a7df48 authored by Lars-Peter Clausen's avatar Lars-Peter Clausen Committed by Greg Kroah-Hartman
Browse files

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: default avatarLars-Peter Clausen <lars@metafoo.de>
Acked-by: default avatarJonathan Cameron <jic23@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 4e5d3f92

drivers/staging/iio/dac/ad5446.c

+2 −10
Original line number Original line Diff line number Diff line
@@ -174,14 +174,6 @@ static const struct ad5446_chip_info ad5446_chip_info_tbl[] = { 
		.channel = AD5446_CHANNEL(16, 16, 0),

		.channel = AD5446_CHANNEL(16, 16, 0),

		.store_sample = ad5446_store_sample,

		.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] = {

	[ID_AD5512A] = {

		.channel = AD5446_CHANNEL(12, 16, 4),

		.channel = AD5446_CHANNEL(12, 16, 4),

		.store_sample = ad5446_store_sample,

		.store_sample = ad5446_store_sample,
@@ -389,8 +381,8 @@ static const struct spi_device_id ad5446_id[] = { 
	{"ad5446", ID_AD5446},

	{"ad5446", ID_AD5446},

	{"ad5512a", ID_AD5512A},

	{"ad5512a", ID_AD5512A},

	{"ad5541a", ID_AD5541A},

	{"ad5541a", ID_AD5541A},

	{"ad5542a", ID_AD5542A},

	{"ad5542a", ID_AD5541A}, /* ad5541a and ad5542a are compatible */

	{"ad5543", ID_AD5543},

	{"ad5543", ID_AD5541A}, /* ad5541a and ad5543 are compatible */

	{"ad5553", ID_AD5553},

	{"ad5553", ID_AD5553},

	{"ad5601", ID_AD5601},

	{"ad5601", ID_AD5601},

	{"ad5611", ID_AD5611},

	{"ad5611", ID_AD5611},

drivers/staging/iio/dac/ad5446.h

+0 −2
Original line number Original line Diff line number Diff line
@@ -74,8 +74,6 @@ enum ad5446_supported_device_ids { 
	ID_AD5444,

	ID_AD5444,

	ID_AD5446,

	ID_AD5446,

	ID_AD5541A,

	ID_AD5541A,

	ID_AD5542A,

	ID_AD5543,

	ID_AD5512A,

	ID_AD5512A,

	ID_AD5553,

	ID_AD5553,

	ID_AD5601,

	ID_AD5601,