diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2016-09-15 00:18:56 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2016-09-15 00:18:56 +0200 |
| commit | fceec41b68143e895f748e72bd07c5e2d45ab185 (patch) | |
| tree | b0c1e54f52b83956989c29a8f3ed50b88f5ede66 /drivers/firmware | |
| parent | e747ea14de075172212823cbcb4a07a8ccd55c35 (diff) | |
| parent | 23c282d62f573263db679e6b4c9f2da82aa24f96 (diff) | |
Merge tag 'qcom-drivers-for-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux into next/drivers
Pull "Qualcomm ARM Based Driver Updates for v4.9" from Andy Gross:
* Silence smem probe defer messages
* Make scm explicitly non-modular
* Assorted SMD bug fixes and minor changes
* Add PM8018 RTC support
* tag 'qcom-drivers-for-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux:
rtc: rtc-pm8xxx: Add support for pm8018 rtc
soc: qcom: smd: Reset rx tail rather than tx
soc: qcom: smd: Represent smd edges as devices
soc: qcom: smd: Request irqs after parsing properties
soc: qcom: smd: Simplify multi channel handling
soc: qcom: smd: Correct compile stub prototypes
firmware: qcom_scm: make it explicitly non-modular
soc: qcom: smem: Silence probe defer error
Diffstat (limited to 'drivers/firmware')
| -rw-r--r-- | drivers/firmware/qcom_scm.c | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/drivers/firmware/qcom_scm.c b/drivers/firmware/qcom_scm.c index e64a501adbf4..d95c70227c05 100644 --- a/drivers/firmware/qcom_scm.c +++ b/drivers/firmware/qcom_scm.c @@ -1,4 +1,7 @@ -/* Copyright (c) 2010,2015, The Linux Foundation. All rights reserved. +/* + * Qualcomm SCM driver + * + * Copyright (c) 2010,2015, The Linux Foundation. All rights reserved. * Copyright (C) 2015 Linaro Ltd. * * This program is free software; you can redistribute it and/or modify @@ -12,7 +15,7 @@ * */ #include <linux/platform_device.h> -#include <linux/module.h> +#include <linux/init.h> #include <linux/cpumask.h> #include <linux/export.h> #include <linux/dma-mapping.h> @@ -376,8 +379,6 @@ static const struct of_device_id qcom_scm_dt_match[] = { {} }; -MODULE_DEVICE_TABLE(of, qcom_scm_dt_match); - static struct platform_driver qcom_scm_driver = { .driver = { .name = "qcom_scm", @@ -414,14 +415,4 @@ static int __init qcom_scm_init(void) return platform_driver_register(&qcom_scm_driver); } - subsys_initcall(qcom_scm_init); - -static void __exit qcom_scm_exit(void) -{ - platform_driver_unregister(&qcom_scm_driver); -} -module_exit(qcom_scm_exit); - -MODULE_DESCRIPTION("Qualcomm SCM driver"); -MODULE_LICENSE("GPL v2"); |