aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/devices.c
diff options
context:
space:
mode:
authorMark A. Greer <mgreer@animalcreek.com>2013-03-18 12:06:33 -0400
committerPaul Walmsley <paul@pwsan.com>2013-03-30 17:51:12 -0400
commit8c7bb5739ef4944278f728211291fdaaf22cd25f (patch)
tree00582a5d4ac51b0e7b1808e47efa5549379fdae7 /arch/arm/mach-omap2/devices.c
parent26f88e6ebfcb4a80050c7345919b9ab8e6eafeae (diff)
ARM: OMAP2+: Remove unnecessary message when no SHA IP is present
Remove the error message that prints when there is no SHA IP present to make it consistent with all the other IPs. CC: Paul Walmsley <paul@pwsan.com> Signed-off-by: Mark A. Greer <mgreer@animalcreek.com> Signed-off-by: Paul Walmsley <paul@pwsan.com>
Diffstat (limited to 'arch/arm/mach-omap2/devices.c')
-rw-r--r--arch/arm/mach-omap2/devices.c18
1 files changed, 7 insertions, 11 deletions
diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c
index df109dc6bd81..9abfcc011b65 100644
--- a/arch/arm/mach-omap2/devices.c
+++ b/arch/arm/mach-omap2/devices.c
@@ -506,19 +506,15 @@ static void omap_init_rng(void)
506 506
507static void __init omap_init_sham(void) 507static void __init omap_init_sham(void)
508{ 508{
509 if (cpu_is_omap24xx() || cpu_is_omap34xx()) { 509 struct omap_hwmod *oh;
510 struct omap_hwmod *oh; 510 struct platform_device *pdev;
511 struct platform_device *pdev;
512 511
513 oh = omap_hwmod_lookup("sham"); 512 oh = omap_hwmod_lookup("sham");
514 if (!oh) 513 if (!oh)
515 return; 514 return;
516 515
517 pdev = omap_device_build("omap-sham", -1, oh, NULL, 0); 516 pdev = omap_device_build("omap-sham", -1, oh, NULL, 0);
518 WARN(IS_ERR(pdev), "Can't build omap_device for omap-sham\n"); 517 WARN(IS_ERR(pdev), "Can't build omap_device for omap-sham\n");
519 } else {
520 pr_err("%s: platform not supported\n", __func__);
521 }
522} 518}
523 519
524#if defined(CONFIG_CRYPTO_DEV_OMAP_AES) || defined(CONFIG_CRYPTO_DEV_OMAP_AES_MODULE) 520#if defined(CONFIG_CRYPTO_DEV_OMAP_AES) || defined(CONFIG_CRYPTO_DEV_OMAP_AES_MODULE)