diff options
author | Arnd Bergmann <arnd@arndb.de> | 2018-01-05 12:22:53 +0100 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2018-01-05 12:22:53 +0100 |
commit | 830ebd37c57709e08c1b010c26ad1659a5853ce1 (patch) | |
tree | c60b529e8b4bc09293749030d6d27b10d73a009c /drivers/firmware | |
parent | 57e36159cc0eed51b37ec9a17214fc0079f75879 (diff) | |
parent | 3aa0582fdb824139630298880fbf78d4ac774d3c (diff) | |
download | linux-830ebd37c57709e08c1b010c26ad1659a5853ce1.tar.gz linux-830ebd37c57709e08c1b010c26ad1659a5853ce1.tar.bz2 linux-830ebd37c57709e08c1b010c26ad1659a5853ce1.zip |
Merge tag 'qcom-drivers-for-4.16' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/agross/linux into next/drivers
Pull "Qualcomm ARM Based Driver Updates for v4.16 - Redo" from Andy Gross:
* Fix error handling code in SMP2P probe
* Update SMP2P to use ACPS as mailbox client
* Add QMI support
* Fixups for Qualcomm SCM
* Fix licensing on rmtfs_mem
* Correct SMSM child node lookup
* Populate firmware nodes during platform init
* tag 'qcom-drivers-for-4.16' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/agross/linux:
of: platform: populate /firmware/ node from of_platform_default_populate_init()
soc: qcom: smp2p: Use common error handling code in qcom_smp2p_probe()
soc: qcom: Introduce QMI helpers
soc: qcom: Introduce QMI encoder/decoder
firmware: qcom_scm: Add dependent headers to qcom_scm.h
soc: qcom: smp2p: Access APCS as mailbox client
soc: qcom: rmtfs_mem: add missing MODULE_DESCRIPTION/AUTHOR/LICENSE
soc: qcom: smsm: fix child-node lookup
firmware: qcom_scm: drop redandant of_platform_populate
Diffstat (limited to 'drivers/firmware')
-rw-r--r-- | drivers/firmware/qcom_scm.c | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/drivers/firmware/qcom_scm.c b/drivers/firmware/qcom_scm.c index af4c75217ea6..5a7d693009ef 100644 --- a/drivers/firmware/qcom_scm.c +++ b/drivers/firmware/qcom_scm.c @@ -622,30 +622,6 @@ static struct platform_driver qcom_scm_driver = { static int __init qcom_scm_init(void) { - struct device_node *np, *fw_np; - int ret; - - fw_np = of_find_node_by_name(NULL, "firmware"); - - if (!fw_np) - return -ENODEV; - - np = of_find_matching_node(fw_np, qcom_scm_dt_match); - - if (!np) { - of_node_put(fw_np); - return -ENODEV; - } - - of_node_put(np); - - ret = of_platform_populate(fw_np, qcom_scm_dt_match, NULL, NULL); - - of_node_put(fw_np); - - if (ret) - return ret; - return platform_driver_register(&qcom_scm_driver); } subsys_initcall(qcom_scm_init); |