ASoC: rsnd: Remove obsolete platform data support
Since commit 3d7608e4c1
("ARM: shmobile: bockw: remove legacy
board file and config"), Renesas R-Car SoCs are only supported in
generic DT-only ARM multi-platform builds. The driver doesn't need to
use platform data anymore, hence remove platform data configuration.
Move <sound/rcar_snd.h> to sound/soc/sh/rcar/, as it's no longer needed
by platform code.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Родитель
462c30bc8b
Коммит
dcc448e619
|
@ -1236,20 +1236,11 @@ static int rsnd_probe(struct platform_device *pdev)
|
|||
};
|
||||
int ret, i;
|
||||
|
||||
info = NULL;
|
||||
of_data = NULL;
|
||||
if (of_id) {
|
||||
info = devm_kzalloc(&pdev->dev,
|
||||
sizeof(struct rcar_snd_info), GFP_KERNEL);
|
||||
of_data = of_id->data;
|
||||
} else {
|
||||
info = pdev->dev.platform_data;
|
||||
}
|
||||
|
||||
if (!info) {
|
||||
dev_err(dev, "driver needs R-Car sound information\n");
|
||||
return -ENODEV;
|
||||
}
|
||||
info = devm_kzalloc(&pdev->dev, sizeof(struct rcar_snd_info),
|
||||
GFP_KERNEL);
|
||||
if (!info)
|
||||
return -ENOMEM;
|
||||
of_data = of_id->data;
|
||||
|
||||
/*
|
||||
* init priv data
|
||||
|
|
|
@ -21,10 +21,11 @@
|
|||
#include <linux/of_irq.h>
|
||||
#include <linux/sh_dma.h>
|
||||
#include <linux/workqueue.h>
|
||||
#include <sound/rcar_snd.h>
|
||||
#include <sound/soc.h>
|
||||
#include <sound/pcm_params.h>
|
||||
|
||||
#include "rcar_snd.h"
|
||||
|
||||
/*
|
||||
* pseudo register
|
||||
*
|
||||
|
|
|
@ -700,9 +700,6 @@ static void rsnd_of_parse_ssi(struct platform_device *pdev,
|
|||
struct device *dev = &pdev->dev;
|
||||
int nr, i;
|
||||
|
||||
if (!of_data)
|
||||
return;
|
||||
|
||||
node = rsnd_ssi_of_node(priv);
|
||||
if (!node)
|
||||
return;
|
||||
|
|
Загрузка…
Ссылка в новой задаче