From 9c08aad66ab0b0f9b31283bfbf64cadebf68a998 Mon Sep 17 00:00:00 2001 From: Bjorn Andersson Date: Mon, 6 Jun 2016 17:01:02 -0700 Subject: [PATCH] Revert "soc: qcom: Stub IPCRTR client driver" This reverts commit 38f515b2f0ee21b27bed1fd36f6710c1ef907765. QRTR has been backported, so we don't need to keep this stub driver. --- drivers/soc/qcom/Kconfig | 5 --- drivers/soc/qcom/Makefile | 2 -- drivers/soc/qcom/ipcrtr_stub.c | 62 ---------------------------------- 3 files changed, 69 deletions(-) delete mode 100644 drivers/soc/qcom/ipcrtr_stub.c diff --git a/drivers/soc/qcom/Kconfig b/drivers/soc/qcom/Kconfig index 4138de6da18b..35fa84660dee 100644 --- a/drivers/soc/qcom/Kconfig +++ b/drivers/soc/qcom/Kconfig @@ -117,8 +117,3 @@ config BUS_TOPOLOGY_ADHOC directionality of connections by explicitly listing device connections thus avoiding illegal routes. -config QCOM_IPCRTR_STUB - tristate "Qualcomm IPCRTR stub driver" - depends on QCOM_SMD - help - Stub driver to bring the IPCRTR channel up. diff --git a/drivers/soc/qcom/Makefile b/drivers/soc/qcom/Makefile index bf6f22a47a2b..56da0a585cfd 100644 --- a/drivers/soc/qcom/Makefile +++ b/drivers/soc/qcom/Makefile @@ -12,6 +12,4 @@ obj-$(CONFIG_MFD_QCOM_SMD_RPM) += rpm_log.o obj-$(CONFIG_MSM_BUS_SCALING) += msm_bus/ obj-$(CONFIG_BUS_TOPOLOGY_ADHOC) += msm_bus/ -obj-$(CONFIG_QCOM_IPCRTR_STUB) += ipcrtr_stub.o - obj-$(CONFIG_QTI_LNX_GPS_PROXY) += gps_proxy.o diff --git a/drivers/soc/qcom/ipcrtr_stub.c b/drivers/soc/qcom/ipcrtr_stub.c deleted file mode 100644 index 6f8d724f4b5e..000000000000 --- a/drivers/soc/qcom/ipcrtr_stub.c +++ /dev/null @@ -1,62 +0,0 @@ -/* - * Copyright (c) 2014, Sony Mobile Communications AB. - * - * 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 - * only version 2 as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ - -#include -#include -#include -#include -#include -#include -#include -#include - -#include - -static int ipcrtr_stub_callback(struct qcom_smd_device *qsdev, - const void *data, - size_t count) -{ - print_hex_dump(KERN_DEBUG, "IPCRTR <<<: ", DUMP_PREFIX_OFFSET, 16, 1, data, count, true); - - return 0; -} - -static int ipcrtr_stub_probe(struct qcom_smd_device *sdev) -{ - dev_err(&sdev->dev, "ipcrtr initialized\n"); - - return 0; -} - -static const struct of_device_id ipcrtr_stub_of_match[] = { - { .compatible = "qcom,ipcrtr" }, - {} -}; -MODULE_DEVICE_TABLE(of, ipcrtr_stub_of_match); - -static struct qcom_smd_driver ipcrtr_stub_driver = { - .probe = ipcrtr_stub_probe, - .callback = ipcrtr_stub_callback, - .driver = { - .name = "ipcrtr_stub", - .owner = THIS_MODULE, - .of_match_table = ipcrtr_stub_of_match, - }, -}; - -module_qcom_smd_driver(ipcrtr_stub_driver); - -MODULE_AUTHOR("Bjorn Andersson "); -MODULE_DESCRIPTION("Qualcomm IPCRTR stub driver"); -MODULE_LICENSE("GPLv2"); - -- 2.39.2