Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit d78b1e43 authored by Charles Keepax's avatar Charles Keepax Committed by Mark Brown
Browse files

ASoC: dapm: Remove clock framework ifdefs 



The clock code now has stub functions defined in its header files so
the ifdefs around clocking code should no longer be necessary.

Signed-off-by: default avatarCharles Keepax <ckeepax@opensource.cirrus.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 5d585e1e

sound/soc/soc-dapm.c

+1 −6
Original line number Diff line number Diff line
@@ -1320,14 +1320,13 @@ int dapm_clock_event(struct snd_soc_dapm_widget *w, 


	soc_dapm_async_complete(w->dapm);



#ifdef CONFIG_HAVE_CLK

	if (SND_SOC_DAPM_EVENT_ON(event)) {

		return clk_prepare_enable(w->clk);

	} else {

		clk_disable_unprepare(w->clk);

		return 0;

	}

#endif



	return 0;

}

EXPORT_SYMBOL_GPL(dapm_clock_event);
@@ -3498,7 +3497,6 @@ snd_soc_dapm_new_control_unlocked(struct snd_soc_dapm_context *dapm, 
		}

		break;

	case snd_soc_dapm_clock_supply:

#ifdef CONFIG_CLKDEV_LOOKUP

		w->clk = devm_clk_get(dapm->dev, w->name);

		if (IS_ERR(w->clk)) {

			ret = PTR_ERR(w->clk);
@@ -3508,9 +3506,6 @@ snd_soc_dapm_new_control_unlocked(struct snd_soc_dapm_context *dapm, 
				w->name, ret);

			return NULL;

		}

#else

		return NULL;

#endif

		break;

	default:

		break;