From b5bfb4e56e28ff154c7f1e1c49331d581172c953 Mon Sep 17 00:00:00 2001 From: Vishvesh Deobhankar Date: Thu, 20 Feb 2020 17:13:44 +0530 Subject: [PATCH] crypto: msm: Add DLKM support for crypto modules Crypto modules on various targets will be available as dynamic loadable modules. Add changes to fix compilation issues faced while changing the same. Change-Id: Icaf16ac04befb544e88c918cc89e68014d0d4c7b Signed-off-by: Vishvesh Deobhankar --- drivers/crypto/msm/Makefile | 4 ++-- drivers/crypto/msm/qcedev.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/crypto/msm/Makefile b/drivers/crypto/msm/Makefile index b712fc193f91..19635d7d176f 100644 --- a/drivers/crypto/msm/Makefile +++ b/drivers/crypto/msm/Makefile @@ -1,6 +1,6 @@ obj-$(CONFIG_CRYPTO_DEV_QCOM_MSM_QCE) += qce50.o -obj-$(CONFIG_CRYPTO_DEV_QCEDEV) += qcedev.o -obj-$(CONFIG_CRYPTO_DEV_QCEDEV) += qcedev_smmu.o +qcedevice-objs := qcedev_smmu.o qcedev.o +obj-$(CONFIG_CRYPTO_DEV_QCEDEV) += qcedevice.o obj-$(CONFIG_CRYPTO_DEV_QCRYPTO) += qcrypto.o obj-$(CONFIG_CRYPTO_DEV_OTA_CRYPTO) += ota_crypto.o obj-$(CONFIG_CRYPTO_DEV_QCOM_ICE) += ice.o diff --git a/drivers/crypto/msm/qcedev.c b/drivers/crypto/msm/qcedev.c index 4e899d1fe71f..9c9d911b4cc7 100644 --- a/drivers/crypto/msm/qcedev.c +++ b/drivers/crypto/msm/qcedev.c @@ -1,7 +1,7 @@ /* * QTI CE device driver. * - * Copyright (c) 2010-2019, The Linux Foundation. All rights reserved. + * Copyright (c) 2010-2020, The Linux Foundation. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -65,14 +65,14 @@ static dev_t qcedev_device_no; static struct class *driver_class; static struct device *class_dev; -MODULE_DEVICE_TABLE(of, qcedev_match); - static const struct of_device_id qcedev_match[] = { { .compatible = "qcom,qcedev"}, { .compatible = "qcom,qcedev,context-bank"}, {} }; +MODULE_DEVICE_TABLE(of, qcedev_match); + static int qcedev_control_clocks(struct qcedev_control *podev, bool enable) { unsigned int control_flag;