* [PATCH 1/2] PCI: vmd: Use preferred header files linux/device.h and linux/msi.h
@ 2021-10-13 0:31 Krzysztof Wilczyński
2021-10-13 0:31 ` [PATCH 2/2] PCI: hotplug: Use preferred header file linux/io.h Krzysztof Wilczyński
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Krzysztof Wilczyński @ 2021-10-13 0:31 UTC (permalink / raw)
To: Bjorn Helgaas
Cc: Lorenzo Pieralisi, Rob Herring, Jonathan Derrick, Nirmal Patel,
linux-pci
Use the preferred generic header files linux/device.h and linux/msi.h
that already include the corresponding asm/device.h and asm/msi.h files,
especially where the headers files linux/msi.h and asm/msi.h where both
included.
Signed-off-by: Krzysztof Wilczyński <kw@linux.com>
---
drivers/pci/controller/vmd.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/pci/controller/vmd.c b/drivers/pci/controller/vmd.c
index a5987e52700e..9609eb911349 100644
--- a/drivers/pci/controller/vmd.c
+++ b/drivers/pci/controller/vmd.c
@@ -9,6 +9,7 @@
#include <linux/irq.h>
#include <linux/kernel.h>
#include <linux/module.h>
+#include <linux/device.h>
#include <linux/msi.h>
#include <linux/pci.h>
#include <linux/pci-acpi.h>
@@ -18,8 +19,6 @@
#include <linux/rcupdate.h>
#include <asm/irqdomain.h>
-#include <asm/device.h>
-#include <asm/msi.h>
#define VMD_CFGBAR 0
#define VMD_MEMBAR1 2
--
2.33.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 2/2] PCI: hotplug: Use preferred header file linux/io.h
2021-10-13 0:31 [PATCH 1/2] PCI: vmd: Use preferred header files linux/device.h and linux/msi.h Krzysztof Wilczyński
@ 2021-10-13 0:31 ` Krzysztof Wilczyński
2021-10-14 18:06 ` Jonathan Derrick
2021-10-14 18:05 ` [PATCH 1/2] PCI: vmd: Use preferred header files linux/device.h and linux/msi.h Jonathan Derrick
2021-11-02 19:45 ` Bjorn Helgaas
2 siblings, 1 reply; 5+ messages in thread
From: Krzysztof Wilczyński @ 2021-10-13 0:31 UTC (permalink / raw)
To: Bjorn Helgaas
Cc: Lorenzo Pieralisi, Rob Herring, Jonathan Derrick, Nirmal Patel,
linux-pci
Use the preferred generic header file linux/io.h that already includes
the corresponding asm/io.h file.
Signed-off-by: Krzysztof Wilczyński <kw@linux.com>
---
drivers/pci/hotplug/cpqphp.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/pci/hotplug/cpqphp.h b/drivers/pci/hotplug/cpqphp.h
index 77e4e0142fbc..2f7b49ea96e2 100644
--- a/drivers/pci/hotplug/cpqphp.h
+++ b/drivers/pci/hotplug/cpqphp.h
@@ -15,7 +15,7 @@
#define _CPQPHP_H
#include <linux/interrupt.h>
-#include <asm/io.h> /* for read? and write? functions */
+#include <linux/io.h> /* for read? and write? functions */
#include <linux/delay.h> /* for delays */
#include <linux/mutex.h>
#include <linux/sched/signal.h> /* for signal_pending() */
--
2.33.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 1/2] PCI: vmd: Use preferred header files linux/device.h and linux/msi.h
2021-10-13 0:31 [PATCH 1/2] PCI: vmd: Use preferred header files linux/device.h and linux/msi.h Krzysztof Wilczyński
2021-10-13 0:31 ` [PATCH 2/2] PCI: hotplug: Use preferred header file linux/io.h Krzysztof Wilczyński
@ 2021-10-14 18:05 ` Jonathan Derrick
2021-11-02 19:45 ` Bjorn Helgaas
2 siblings, 0 replies; 5+ messages in thread
From: Jonathan Derrick @ 2021-10-14 18:05 UTC (permalink / raw)
To: Krzysztof Wilczyński, Bjorn Helgaas
Cc: Lorenzo Pieralisi, Rob Herring, Nirmal Patel, linux-pci
On 10/12/2021 6:31 PM, Krzysztof Wilczyński wrote:
> Use the preferred generic header files linux/device.h and linux/msi.h
> that already include the corresponding asm/device.h and asm/msi.h files,
> especially where the headers files linux/msi.h and asm/msi.h where both
> included.
>
> Signed-off-by: Krzysztof Wilczyński <kw@linux.com>
> ---
> drivers/pci/controller/vmd.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/drivers/pci/controller/vmd.c b/drivers/pci/controller/vmd.c
> index a5987e52700e..9609eb911349 100644
> --- a/drivers/pci/controller/vmd.c
> +++ b/drivers/pci/controller/vmd.c
> @@ -9,6 +9,7 @@
> #include <linux/irq.h>
> #include <linux/kernel.h>
> #include <linux/module.h>
> +#include <linux/device.h>
> #include <linux/msi.h>
> #include <linux/pci.h>
> #include <linux/pci-acpi.h>
> @@ -18,8 +19,6 @@
> #include <linux/rcupdate.h>
>
> #include <asm/irqdomain.h>
> -#include <asm/device.h>
> -#include <asm/msi.h>
>
> #define VMD_CFGBAR 0
> #define VMD_MEMBAR1 2
>
Reviewed-by: Jonathan Derrick <jonathan.derrick@linux.dev>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 2/2] PCI: hotplug: Use preferred header file linux/io.h
2021-10-13 0:31 ` [PATCH 2/2] PCI: hotplug: Use preferred header file linux/io.h Krzysztof Wilczyński
@ 2021-10-14 18:06 ` Jonathan Derrick
0 siblings, 0 replies; 5+ messages in thread
From: Jonathan Derrick @ 2021-10-14 18:06 UTC (permalink / raw)
To: Krzysztof Wilczyński, Bjorn Helgaas
Cc: Lorenzo Pieralisi, Rob Herring, Nirmal Patel, linux-pci
On 10/12/2021 6:31 PM, Krzysztof Wilczyński wrote:
> Use the preferred generic header file linux/io.h that already includes
> the corresponding asm/io.h file.
>
> Signed-off-by: Krzysztof Wilczyński <kw@linux.com>
> ---
> drivers/pci/hotplug/cpqphp.h | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/pci/hotplug/cpqphp.h b/drivers/pci/hotplug/cpqphp.h
> index 77e4e0142fbc..2f7b49ea96e2 100644
> --- a/drivers/pci/hotplug/cpqphp.h
> +++ b/drivers/pci/hotplug/cpqphp.h
> @@ -15,7 +15,7 @@
> #define _CPQPHP_H
>
> #include <linux/interrupt.h>
> -#include <asm/io.h> /* for read? and write? functions */
> +#include <linux/io.h> /* for read? and write? functions */
> #include <linux/delay.h> /* for delays */
> #include <linux/mutex.h>
> #include <linux/sched/signal.h> /* for signal_pending() */
>
Reviewed-by: Jonathan Derrick <jonathan.derrick@linux.dev>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 1/2] PCI: vmd: Use preferred header files linux/device.h and linux/msi.h
2021-10-13 0:31 [PATCH 1/2] PCI: vmd: Use preferred header files linux/device.h and linux/msi.h Krzysztof Wilczyński
2021-10-13 0:31 ` [PATCH 2/2] PCI: hotplug: Use preferred header file linux/io.h Krzysztof Wilczyński
2021-10-14 18:05 ` [PATCH 1/2] PCI: vmd: Use preferred header files linux/device.h and linux/msi.h Jonathan Derrick
@ 2021-11-02 19:45 ` Bjorn Helgaas
2 siblings, 0 replies; 5+ messages in thread
From: Bjorn Helgaas @ 2021-11-02 19:45 UTC (permalink / raw)
To: Krzysztof Wilczyński
Cc: Bjorn Helgaas, Lorenzo Pieralisi, Rob Herring, Jonathan Derrick,
Nirmal Patel, linux-pci
On Wed, Oct 13, 2021 at 12:31:44AM +0000, Krzysztof Wilczyński wrote:
> Use the preferred generic header files linux/device.h and linux/msi.h
> that already include the corresponding asm/device.h and asm/msi.h files,
> especially where the headers files linux/msi.h and asm/msi.h where both
> included.
>
> Signed-off-by: Krzysztof Wilczyński <kw@linux.com>
Applied both to pci/misc for v5.16, thanks!
> ---
> drivers/pci/controller/vmd.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/drivers/pci/controller/vmd.c b/drivers/pci/controller/vmd.c
> index a5987e52700e..9609eb911349 100644
> --- a/drivers/pci/controller/vmd.c
> +++ b/drivers/pci/controller/vmd.c
> @@ -9,6 +9,7 @@
> #include <linux/irq.h>
> #include <linux/kernel.h>
> #include <linux/module.h>
> +#include <linux/device.h>
> #include <linux/msi.h>
> #include <linux/pci.h>
> #include <linux/pci-acpi.h>
> @@ -18,8 +19,6 @@
> #include <linux/rcupdate.h>
>
> #include <asm/irqdomain.h>
> -#include <asm/device.h>
> -#include <asm/msi.h>
>
> #define VMD_CFGBAR 0
> #define VMD_MEMBAR1 2
> --
> 2.33.0
>
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2021-11-02 19:45 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-10-13 0:31 [PATCH 1/2] PCI: vmd: Use preferred header files linux/device.h and linux/msi.h Krzysztof Wilczyński
2021-10-13 0:31 ` [PATCH 2/2] PCI: hotplug: Use preferred header file linux/io.h Krzysztof Wilczyński
2021-10-14 18:06 ` Jonathan Derrick
2021-10-14 18:05 ` [PATCH 1/2] PCI: vmd: Use preferred header files linux/device.h and linux/msi.h Jonathan Derrick
2021-11-02 19:45 ` Bjorn Helgaas
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).