aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/tuners
diff options
context:
space:
mode:
authorAntti Palosaari <crope@iki.fi>2014-12-06 15:07:45 -0300
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>2015-01-29 18:49:09 -0200
commitc12922338cb9d1f06cf0951ad3ee692f7d3d96f9 (patch)
tree2143fa38a6763d1e54c3f0c83d34120922a85140 /drivers/media/tuners
parent[media] si2157: change firmware download error handling (diff)
downloadlinux-dev-c12922338cb9d1f06cf0951ad3ee692f7d3d96f9.tar.xz
linux-dev-c12922338cb9d1f06cf0951ad3ee692f7d3d96f9.zip
[media] si2157: trivial ID table changes
- Rename ID table. - Remove magic numbers from ID table driver data field. Signed-off-by: Antti Palosaari <crope@iki.fi> Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'drivers/media/tuners')
-rw-r--r--drivers/media/tuners/si2157.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/media/tuners/si2157.c b/drivers/media/tuners/si2157.c
index 6174c8eaa8b4..211d500a74dd 100644
--- a/drivers/media/tuners/si2157.c
+++ b/drivers/media/tuners/si2157.c
@@ -383,12 +383,12 @@ static int si2157_remove(struct i2c_client *client)
return 0;
}
-static const struct i2c_device_id si2157_id[] = {
- {"si2157", 0},
- {"si2146", 1},
+static const struct i2c_device_id si2157_id_table[] = {
+ {"si2157", SI2157_CHIPTYPE_SI2157},
+ {"si2146", SI2157_CHIPTYPE_SI2146},
{}
};
-MODULE_DEVICE_TABLE(i2c, si2157_id);
+MODULE_DEVICE_TABLE(i2c, si2157_id_table);
static struct i2c_driver si2157_driver = {
.driver = {
@@ -397,7 +397,7 @@ static struct i2c_driver si2157_driver = {
},
.probe = si2157_probe,
.remove = si2157_remove,
- .id_table = si2157_id,
+ .id_table = si2157_id_table,
};
module_i2c_driver(si2157_driver);