summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/prm2xxx.c
diff options
context:
space:
mode:
authorTero Kristo <t-kristo@ti.com>2014-05-11 19:54:58 -0600
committerPaul Walmsley <paul@pwsan.com>2014-05-15 22:34:51 -0600
commitd8871cd245ece932ced994457e044d0f68b0aab4 (patch)
tree13388f9dc727f869a9778f5225609177182ebaf1 /arch/arm/mach-omap2/prm2xxx.c
parent4794208c5b0122e51e3e13830bb707466b638c4c (diff)
downloadblackbird-op-linux-d8871cd245ece932ced994457e044d0f68b0aab4.tar.gz
blackbird-op-linux-d8871cd245ece932ced994457e044d0f68b0aab4.zip
ARM: OMAP2+: PRM: remove unnecessary cpu_is_XXX calls from prm_init / exit
Done in preparation to make PRM its own driver, as the cpu_is_XXX calls are not available outside mach-omap2 folder. The init functions are called only from cpu specific init chain, and thus don't need to double check against cpu type. The exit calls check against the data provided during init-time registration and thus don't need cpu check either. Signed-off-by: Tero Kristo <t-kristo@ti.com> [paul@pwsan.com: updated to apply] Signed-off-by: Paul Walmsley <paul@pwsan.com>
Diffstat (limited to 'arch/arm/mach-omap2/prm2xxx.c')
-rw-r--r--arch/arm/mach-omap2/prm2xxx.c13
1 files changed, 1 insertions, 12 deletions
diff --git a/arch/arm/mach-omap2/prm2xxx.c b/arch/arm/mach-omap2/prm2xxx.c
index 418de9c3b319..a3a3cca2bcc4 100644
--- a/arch/arm/mach-omap2/prm2xxx.c
+++ b/arch/arm/mach-omap2/prm2xxx.c
@@ -18,9 +18,6 @@
#include <linux/io.h>
#include <linux/irq.h>
-#include "soc.h"
-#include "common.h"
-#include "vp.h"
#include "powerdomain.h"
#include "clockdomain.h"
#include "prm2xxx.h"
@@ -201,19 +198,11 @@ static struct prm_ll_data omap2xxx_prm_ll_data = {
int __init omap2xxx_prm_init(void)
{
- if (!cpu_is_omap24xx())
- return 0;
-
return prm_register(&omap2xxx_prm_ll_data);
}
static void __exit omap2xxx_prm_exit(void)
{
- if (!cpu_is_omap24xx())
- return;
-
- /* Should never happen */
- WARN(prm_unregister(&omap2xxx_prm_ll_data),
- "%s: prm_ll_data function pointer mismatch\n", __func__);
+ prm_unregister(&omap2xxx_prm_ll_data);
}
__exitcall(omap2xxx_prm_exit);
OpenPOWER on IntegriCloud