diff options
| author | Jonas Aaberg <jonas.aberg@stericsson.com> | 2011-06-01 08:25:38 +0200 |
|---|---|---|
| committer | Ulf Hansson <ulf.hansson@stericsson.com> | 2011-09-19 15:15:34 +0200 |
| commit | b21d5c635969c18bcd3602326defced5dc3278fd (patch) | |
| tree | 4f293e361ccd31fe9aa331588622bb9bf28883d3 /sound | |
| parent | e31bbe6fa8e2d8449bbb6fbfc5087fcd0108aaf7 (diff) | |
sound: u8500: msp: Remove v1 support
ST-Ericsson Linux next: Not tested, ask SSM for ER
ST-Ericsson ID: -
ST-Ericsson FOSS-OUT ID: Trivial
Signed-off-by: Jonas Aaberg <jonas.aberg@stericsson.com>
Change-Id: I9cdae05681ec60f13cf9079a4d3b0292157da91d
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/24282
Reviewed-by: QATEST
Reviewed-by: Ola LILJA2 <ola.o.lilja@stericsson.com>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/ux500/ux500_msp_dai.c | 39 |
1 files changed, 6 insertions, 33 deletions
diff --git a/sound/soc/ux500/ux500_msp_dai.c b/sound/soc/ux500/ux500_msp_dai.c index 78e78e1fc04..3cbd3b783a5 100644 --- a/sound/soc/ux500/ux500_msp_dai.c +++ b/sound/soc/ux500/ux500_msp_dai.c @@ -969,60 +969,33 @@ static int ux500_msp_drv_remove(struct i2s_device *i2s_dev) return 0; } -static const struct i2s_device_id dev_id_table_v1[] = { - { "i2s_device.0", 0, 0 }, - { "i2s_device.1", 1, 0 }, - { "i2s_device.2", 2, 0 }, - { }, -}; -MODULE_DEVICE_TABLE(i2s, dev_id_table_v1); - -static const struct i2s_device_id dev_id_table_v2[] = { +static const struct i2s_device_id dev_id_table[] = { { "i2s_device.0", 0, 0 }, { "i2s_device.1", 1, 0 }, { "i2s_device.2", 2, 0 }, { "i2s_device.3", 3, 0 }, { }, }; -MODULE_DEVICE_TABLE(i2s, dev_id_table_v2); - +MODULE_DEVICE_TABLE(i2s, dev_id_table); -static struct i2s_driver i2sdrv_i2s_v1 = { - .driver = { - .name = "i2s", - .owner = THIS_MODULE, - }, - .probe = ux500_msp_drv_probe, - .remove = ux500_msp_drv_remove, - .id_table = dev_id_table_v1, -}; - -static struct i2s_driver i2sdrv_i2s_v2 = { +static struct i2s_driver i2sdrv_i2s = { .driver = { .name = "i2s", .owner = THIS_MODULE, }, .probe = ux500_msp_drv_probe, .remove = __devexit_p(ux500_msp_drv_remove), - .id_table = dev_id_table_v2, + .id_table = dev_id_table, }; static int __init ux500_msp_init(void) { - if (cpu_is_u8500ed() || cpu_is_u8500v1() || cpu_is_u8500v11()) - return i2s_register_driver(&i2sdrv_i2s_v1); - else - return i2s_register_driver(&i2sdrv_i2s_v2); + return i2s_register_driver(&i2sdrv_i2s); } static void __exit ux500_msp_exit(void) { - pr_debug("%s: Enter.\n", __func__); - - if (cpu_is_u8500ed() || cpu_is_u8500v1() || cpu_is_u8500v11()) - i2s_unregister_driver(&i2sdrv_i2s_v1); - else - i2s_unregister_driver(&i2sdrv_i2s_v2); + i2s_unregister_driver(&i2sdrv_i2s); } module_init(ux500_msp_init); |