From: Kevin Hilman Date: Mon, 18 Jun 2012 18:12:24 +0000 (-0600) Subject: ARM: OMAP4: hwmod: drop extra cpu_is check from _wait_target_disable() X-Git-Tag: firefly_0821_release~3680^2~2397^2~1^2^2^2^3~3 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=baa2607f56f1589eb21c01fe16aa5f5c3f9dad31;p=firefly-linux-kernel-4.4.55.git ARM: OMAP4: hwmod: drop extra cpu_is check from _wait_target_disable() _omap4_wait_target_disable() is called only from inside _omap4_disable_module() which is already protected by SoC specific checks. Remove the cpu_is check here. Signed-off-by: Kevin Hilman --- diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c index 634a79836c64..2b845836f7dc 100644 --- a/arch/arm/mach-omap2/omap_hwmod.c +++ b/arch/arm/mach-omap2/omap_hwmod.c @@ -823,9 +823,6 @@ static void _omap4_enable_module(struct omap_hwmod *oh) */ static int _omap4_wait_target_disable(struct omap_hwmod *oh) { - if (!cpu_is_omap44xx()) - return 0; - if (!oh) return -EINVAL;