Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-23 04:31:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

ASoC: fsi: don't use platform info pointer on probe()

Browse Source 
Current FSI driver is using platform info pointer,
but it is not good design for DT support.
This patch made it not to use platform info pointer.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
Kuninori Morimoto 2012-12-27 19:15:08 -08:00 committed by Mark Brown
parent 5d0bfc5eb9
commit fd974e52db
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
sound/soc/sh/fsi.c
View File

@ -1918,16 +1918,15 @@ static int fsi_probe(struct platform_device *pdev)
{
struct fsi_master *master;
const struct platform_device_id *id_entry;
struct sh_fsi_platform_info *info = pdev->dev.platform_data;
struct sh_fsi_port_info nul_info, *pinfo;
struct sh_fsi_platform_info info;
struct fsi_priv *fsi;
struct resource *res;
unsigned int irq;
int ret;
nul_info.flags = 0;
nul_info.tx_id = 0;
nul_info.rx_id = 0;
memset(&info, 0, sizeof(info));
if (pdev->dev.platform_data)
memcpy(&info, pdev->dev.platform_data, sizeof(info));
id_entry = pdev->id_entry;
if (!id_entry) {
@ -1961,12 +1960,11 @@ static int fsi_probe(struct platform_device *pdev)
spin_lock_init(&master->lock);
/* FSI A setting */
pinfo = (info) ? &info->port_a : &nul_info;
fsi = &master->fsia;
fsi->base = master->base;
fsi->master = master;
fsi_port_info_init(fsi, pinfo);
fsi_handler_init(fsi, pinfo);
fsi_port_info_init(fsi, &info.port_a);
fsi_handler_init(fsi, &info.port_a);
ret = fsi_stream_probe(fsi, &pdev->dev);
if (ret < 0) {
dev_err(&pdev->dev, "FSIA stream probe failed\n");
@ -1974,12 +1972,11 @@ static int fsi_probe(struct platform_device *pdev)
}
/* FSI B setting */
pinfo = (info) ? &info->port_b : &nul_info;
fsi = &master->fsib;
fsi->base = master->base + 0x40;
fsi->master = master;
fsi_port_info_init(fsi, pinfo);
fsi_handler_init(fsi, pinfo);
fsi_port_info_init(fsi, &info.port_b);
fsi_handler_init(fsi, &info.port_b);
ret = fsi_stream_probe(fsi, &pdev->dev);
if (ret < 0) {
dev_err(&pdev->dev, "FSIB stream probe failed\n");