From: Sinan Kaya <okaya@kernel.org>
To: linux-next@vger.kernel.org
Cc: linux-acpi@vger.kernel.org, Sinan Kaya <okaya@kernel.org>,
Zhang Rui <rui.zhang@intel.com>,
Eduardo Valentin <edubezval@gmail.com>,
Daniel Lezcano <daniel.lezcano@linaro.org>,
Sumeet Pawnikar <sumeet.r.pawnikar@intel.com>,
Amit Kucheria <amit.kucheria@linaro.org>,
"open list:THERMAL" <linux-pm@vger.kernel.org>,
open list <linux-kernel@vger.kernel.org>
Subject: [PATCH v1 07/11] drivers: thermal: Hide PCI driver when CONFIG_PCI is unset
Date: Sat, 22 Dec 2018 00:14:48 +0000 [thread overview]
Message-ID: <20181222001452.7474-8-okaya@kernel.org> (raw)
In-Reply-To: <20181222001452.7474-1-okaya@kernel.org>
This driver is both a platform and PCI driver. Hide PCI specific pieces
when CONFIG_PCI is unset.
Signed-off-by: Sinan Kaya <okaya@kernel.org>
---
.../intel/int340x_thermal/processor_thermal_device.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/drivers/thermal/intel/int340x_thermal/processor_thermal_device.c b/drivers/thermal/intel/int340x_thermal/processor_thermal_device.c
index 284cf2c5a8fd..b84a475a1162 100644
--- a/drivers/thermal/intel/int340x_thermal/processor_thermal_device.c
+++ b/drivers/thermal/intel/int340x_thermal/processor_thermal_device.c
@@ -374,6 +374,7 @@ static int int3401_remove(struct platform_device *pdev)
return 0;
}
+#ifdef CONFIG_PCI
static irqreturn_t proc_thermal_pci_msi_irq(int irq, void *devid)
{
struct proc_thermal_device *proc_priv;
@@ -482,6 +483,7 @@ static struct pci_driver proc_thermal_pci_driver = {
.remove = proc_thermal_pci_remove,
.id_table = proc_thermal_pci_ids,
};
+#endif
static const struct acpi_device_id int3401_device_ids[] = {
{"INT3401", 0},
@@ -505,16 +507,18 @@ static int __init proc_thermal_init(void)
ret = platform_driver_register(&int3401_driver);
if (ret)
return ret;
-
+#ifdef CONFIG_PCI
ret = pci_register_driver(&proc_thermal_pci_driver);
-
+#endif
return ret;
}
static void __exit proc_thermal_exit(void)
{
platform_driver_unregister(&int3401_driver);
+#ifdef CONFIG_PCI
pci_unregister_driver(&proc_thermal_pci_driver);
+#endif
}
module_init(proc_thermal_init);
--
2.19.0
WARNING: multiple messages have this Message-ID (diff)
From: Sinan Kaya <okaya@kernel.org>
To: linux-next@vger.kernel.org
Cc: linux-acpi@vger.kernel.org, Sinan Kaya <okaya@kernel.org>,
Zhang Rui <rui.zhang@intel.com>,
Eduardo Valentin <edubezval@gmail.com>,
Daniel Lezcano <daniel.lezcano@linaro.org>,
Sumeet Pawnikar <sumeet.r.pawnikar@intel.com>,
Amit Kucheria <amit.kucheria@linaro.org>,
linux-pm@vger.kernel.org (open list:THERMAL),
linux-kernel@vger.kernel.org (open list)
Subject: [PATCH v1 07/11] drivers: thermal: Hide PCI driver when CONFIG_PCI is unset
Date: Sat, 22 Dec 2018 00:14:48 +0000 [thread overview]
Message-ID: <20181222001452.7474-8-okaya@kernel.org> (raw)
In-Reply-To: <20181222001452.7474-1-okaya@kernel.org>
This driver is both a platform and PCI driver. Hide PCI specific pieces
when CONFIG_PCI is unset.
Signed-off-by: Sinan Kaya <okaya@kernel.org>
---
.../intel/int340x_thermal/processor_thermal_device.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/drivers/thermal/intel/int340x_thermal/processor_thermal_device.c b/drivers/thermal/intel/int340x_thermal/processor_thermal_device.c
index 284cf2c5a8fd..b84a475a1162 100644
--- a/drivers/thermal/intel/int340x_thermal/processor_thermal_device.c
+++ b/drivers/thermal/intel/int340x_thermal/processor_thermal_device.c
@@ -374,6 +374,7 @@ static int int3401_remove(struct platform_device *pdev)
return 0;
}
+#ifdef CONFIG_PCI
static irqreturn_t proc_thermal_pci_msi_irq(int irq, void *devid)
{
struct proc_thermal_device *proc_priv;
@@ -482,6 +483,7 @@ static struct pci_driver proc_thermal_pci_driver = {
.remove = proc_thermal_pci_remove,
.id_table = proc_thermal_pci_ids,
};
+#endif
static const struct acpi_device_id int3401_device_ids[] = {
{"INT3401", 0},
@@ -505,16 +507,18 @@ static int __init proc_thermal_init(void)
ret = platform_driver_register(&int3401_driver);
if (ret)
return ret;
-
+#ifdef CONFIG_PCI
ret = pci_register_driver(&proc_thermal_pci_driver);
-
+#endif
return ret;
}
static void __exit proc_thermal_exit(void)
{
platform_driver_unregister(&int3401_driver);
+#ifdef CONFIG_PCI
pci_unregister_driver(&proc_thermal_pci_driver);
+#endif
}
module_init(proc_thermal_init);
--
2.19.0
next prev parent reply other threads:[~2018-12-22 0:14 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20181222001452.7474-1-okaya@kernel.org>
2018-12-22 0:14 ` [PATCH v1 01/11] ACPI / LPSS: Add guards against CONFIG_PCI Sinan Kaya
2018-12-22 0:14 ` Sinan Kaya
2018-12-22 0:14 ` [PATCH v1 02/11] ata: make PCI dependency explicit for PATA_ACPI Sinan Kaya
2018-12-22 0:14 ` Sinan Kaya
2018-12-22 0:14 ` [PATCH v1 03/11] vga-switcheroo: make PCI dependency explicit Sinan Kaya
2018-12-22 0:14 ` Sinan Kaya
2018-12-22 7:51 ` Lukas Wunner
2018-12-22 7:51 ` Lukas Wunner
2018-12-22 0:14 ` [PATCH v1 04/11] platform/x86: " Sinan Kaya
2018-12-22 0:14 ` Sinan Kaya
2018-12-22 0:14 ` [PATCH v1 05/11] platform/x86: intel_pmc: Hide PCI specific pieces behind CONFIG_PCI Sinan Kaya
2018-12-22 0:14 ` Sinan Kaya
2018-12-22 0:14 ` [PATCH v1 06/11] platform/x86: apple-gmux: hide PCI specific code Sinan Kaya
2018-12-22 0:14 ` Sinan Kaya
2018-12-22 8:03 ` Lukas Wunner
2018-12-22 8:31 ` Sinan Kaya
[not found] ` <CAHp75VfTmWN4bTNPaTL2KYYUWARvix67ynx2cKGzhO3o-0VY=g@mail.gmail.com>
2018-12-25 13:33 ` Sinan Kaya
2018-12-22 0:14 ` Sinan Kaya [this message]
2018-12-22 0:14 ` [PATCH v1 07/11] drivers: thermal: Hide PCI driver when CONFIG_PCI is unset Sinan Kaya
2018-12-22 0:14 ` [PATCH v1 08/11] ASoC: Intel: Make PCI dependency explicit Sinan Kaya
2018-12-22 0:14 ` Sinan Kaya
2018-12-22 3:18 ` Randy Dunlap
2018-12-22 3:18 ` Randy Dunlap
2018-12-22 6:26 ` Sinan Kaya
2018-12-22 8:34 ` Sinan Kaya
2018-12-22 0:14 ` [PATCH v1 09/11] mmc: add PCI dependency into IOSF_MBI Sinan Kaya
2018-12-22 0:14 ` Sinan Kaya
2018-12-22 0:14 ` [PATCH v1 10/11] x86: select IOSF_MBI only when CONFIG_PCI is set Sinan Kaya
2018-12-22 0:14 ` Sinan Kaya
2018-12-22 0:14 ` [PATCH v1 11/11] drivers: thermal: Make PCI dependency explicit Sinan Kaya
2018-12-22 0:14 ` Sinan Kaya
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20181222001452.7474-8-okaya@kernel.org \
--to=okaya@kernel.org \
--cc=amit.kucheria@linaro.org \
--cc=daniel.lezcano@linaro.org \
--cc=edubezval@gmail.com \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=rui.zhang@intel.com \
--cc=sumeet.r.pawnikar@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.