Merge branch 'regulator-4.20' into regulator-next

[linux-2.6-block.git] / drivers / cpufreq / qcom-cpufreq-kryo.c

diff --git a/drivers/cpufreq/qcom-cpufreq-kryo.c b/drivers/cpufreq/qcom-cpufreq-kryo.c
index 29389accf3e97df7a5700b49e980c88de0974583..2a3675c24032bc8059c4c591698d6a7b5218cf1d 100644 (file)
--- a/drivers/cpufreq/qcom-cpufreq-kryo.c
+++ b/drivers/cpufreq/qcom-cpufreq-kryo.c
@@ -44,7 +44,7 @@ enum _msm8996_version {
 
 struct platform_device *cpufreq_dt_pdev, *kryo_cpufreq_pdev;
 
-static enum _msm8996_version __init qcom_cpufreq_kryo_get_msm_id(void)
+static enum _msm8996_version qcom_cpufreq_kryo_get_msm_id(void)
 {
        size_t len;
        u32 *msm_id;
@@ -109,8 +109,9 @@ static int qcom_cpufreq_kryo_probe(struct platform_device *pdev)
        speedbin_nvmem = of_nvmem_cell_get(np, NULL);
        of_node_put(np);
        if (IS_ERR(speedbin_nvmem)) {
-               dev_err(cpu_dev, "Could not get nvmem cell: %ld\n",
-                       PTR_ERR(speedbin_nvmem));
+               if (PTR_ERR(speedbin_nvmem) != -EPROBE_DEFER)
+                       dev_err(cpu_dev, "Could not get nvmem cell: %ld\n",
+                               PTR_ERR(speedbin_nvmem));
                return PTR_ERR(speedbin_nvmem);
        }
 
@@ -183,6 +184,7 @@ static struct platform_driver qcom_cpufreq_kryo_driver = {
 static const struct of_device_id qcom_cpufreq_kryo_match_list[] __initconst = {
        { .compatible = "qcom,apq8096", },
        { .compatible = "qcom,msm8996", },
+       {}
 };
 
 /*
@@ -220,7 +222,7 @@ static int __init qcom_cpufreq_kryo_init(void)
 }
 module_init(qcom_cpufreq_kryo_init);
 
-static void __init qcom_cpufreq_kryo_exit(void)
+static void __exit qcom_cpufreq_kryo_exit(void)
 {
        platform_device_unregister(kryo_cpufreq_pdev);
        platform_driver_unregister(&qcom_cpufreq_kryo_driver);