UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

ASoC: wm_adsp: Allow bus error handler to be called directly 

There is no need for end drivers to add helper functions to allow the
bus error handler to be called, simply update the prototype so it can be
called directly.

Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Link: https://lore.kernel.org/r/20190725163931.24964-1-ckeepax@opensource.cirrus.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Charles Keepax 2019-07-25 17:39:29 +01:00 committed by Mark Brown
parent 5af9e972ac
commit 01ec57a437
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
3 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sound/soc/codecs/cs47l90.c
View File

@ -2402,13 +2402,6 @@ static irqreturn_t cs47l90_adsp2_irq(int irq, void *data)
return IRQ_HANDLED; return IRQ_HANDLED;
} }
static irqreturn_t cs47l90_dsp_bus_error(int irq, void *data)
{
struct wm_adsp *dsp = (struct wm_adsp *)data;
return wm_adsp2_bus_error(dsp);
}
static int cs47l90_component_probe(struct snd_soc_component *component) static int cs47l90_component_probe(struct snd_soc_component *component)
{ {
struct cs47l90 *cs47l90 = snd_soc_component_get_drvdata(component); struct cs47l90 *cs47l90 = snd_soc_component_get_drvdata(component);
@ -2558,7 +2551,7 @@ static int cs47l90_probe(struct platform_device *pdev)
if (ret == 0) { if (ret == 0) {
ret = madera_init_bus_error_irq(&cs47l90->core, i, ret = madera_init_bus_error_irq(&cs47l90->core, i,
cs47l90_dsp_bus_error); wm_adsp2_bus_error);
if (ret != 0) if (ret != 0)
wm_adsp2_remove(&cs47l90->core.adsp[i]); wm_adsp2_remove(&cs47l90->core.adsp[i]);
} }

6
sound/soc/codecs/wm_adsp.c
View File

@ -4242,8 +4242,9 @@ static void wm_adsp_fatal_error(struct wm_adsp *dsp)
} }
} }
irqreturn_t wm_adsp2_bus_error(struct wm_adsp *dsp) irqreturn_t wm_adsp2_bus_error(int irq, void *data)
{ {
struct wm_adsp *dsp = (struct wm_adsp *)data;
unsigned int val; unsigned int val;
struct regmap *regmap = dsp->regmap; struct regmap *regmap = dsp->regmap;
int ret = 0; int ret = 0;
@ -4307,8 +4308,9 @@ error:
} }
EXPORT_SYMBOL_GPL(wm_adsp2_bus_error); EXPORT_SYMBOL_GPL(wm_adsp2_bus_error);
irqreturn_t wm_halo_bus_error(struct wm_adsp *dsp) irqreturn_t wm_halo_bus_error(int irq, void *data)
{ {
struct wm_adsp *dsp = (struct wm_adsp *)data;
struct regmap *regmap = dsp->regmap; struct regmap *regmap = dsp->regmap;
unsigned int fault[6]; unsigned int fault[6];
struct reg_sequence clear[] = { struct reg_sequence clear[] = {

4
sound/soc/codecs/wm_adsp.h
View File

@ -171,8 +171,8 @@ int wm_adsp1_event(struct snd_soc_dapm_widget *w,
int wm_adsp_early_event(struct snd_soc_dapm_widget *w, int wm_adsp_early_event(struct snd_soc_dapm_widget *w,
struct snd_kcontrol *kcontrol, int event); struct snd_kcontrol *kcontrol, int event);
irqreturn_t wm_adsp2_bus_error(struct wm_adsp *adsp); irqreturn_t wm_adsp2_bus_error(int irq, void *data);
irqreturn_t wm_halo_bus_error(struct wm_adsp *dsp); irqreturn_t wm_halo_bus_error(int irq, void *data);
irqreturn_t wm_halo_wdt_expire(int irq, void *data); irqreturn_t wm_halo_wdt_expire(int irq, void *data);
int wm_adsp_event(struct snd_soc_dapm_widget *w, int wm_adsp_event(struct snd_soc_dapm_widget *w,