From 43906b194a3f6599a6923ab4ef3328591667501a Mon Sep 17 00:00:00 2001 From: Silvano di Ninno Date: Fri, 16 Mar 2018 14:46:28 +0100 Subject: [PATCH] MLK-17674-1: sm_store remove CONFIG_OF I.MX linux only works with device tree support No need to keep code without CONFIG_OF Signed-off-by: Silvano di Ninno --- drivers/crypto/caam/sm_store.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/drivers/crypto/caam/sm_store.c b/drivers/crypto/caam/sm_store.c index 89346ce707bc..207ca272ddc1 100644 --- a/drivers/crypto/caam/sm_store.c +++ b/drivers/crypto/caam/sm_store.c @@ -1020,16 +1020,11 @@ int caam_sm_startup(struct platform_device *pdev) spin_lock_init(&smpriv->kslock); /* Create the dev */ -#ifdef CONFIG_OF np = of_find_compatible_node(NULL, NULL, "fsl,imx6q-caam-sm"); if (np) of_node_clear_flag(np, OF_POPULATED); sm_pdev = of_platform_device_create(np, "caam_sm", ctrldev); -#else - sm_pdev = platform_device_register_data(ctrldev, "caam_sm", 0, - smpriv, - sizeof(struct caam_drv_private_sm)); -#endif + if (sm_pdev == NULL) { kfree(smpriv); return -EINVAL; @@ -1192,7 +1187,7 @@ void caam_sm_shutdown(struct platform_device *pdev) kfree(smpriv); } EXPORT_SYMBOL(caam_sm_shutdown); -#ifdef CONFIG_OF + static void __exit caam_sm_exit(void) { struct device_node *dev_node; @@ -1249,4 +1244,3 @@ module_exit(caam_sm_exit); MODULE_LICENSE("Dual BSD/GPL"); MODULE_DESCRIPTION("FSL CAAM Secure Memory / Keystore"); MODULE_AUTHOR("Freescale Semiconductor - NMSG/MAD"); -#endif -- 2.17.1