2021-11-04 06:42:31

by Jiabing Wan

Subject: [PATCH] PCI: vmd: Remove duplicated include in vmd.c

Fix following checkincludes.pl warning:
./drivers/pci/controller/vmd.c: linux/device.h is included more than once.

The include is in line 7. Remove the duplicated here.

Signed-off-by: Wan Jiabing <[email protected]>
---
drivers/pci/controller/vmd.c | 1 -
1 file changed, 1 deletion(-)

diff --git a/drivers/pci/controller/vmd.c b/drivers/pci/controller/vmd.c
index b48d9998e324..a45e8e59d3d4 100644
--- a/drivers/pci/controller/vmd.c
+++ b/drivers/pci/controller/vmd.c
@@ -10,7 +10,6 @@
#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>
--
2.20.1

2021-11-04 11:18:11

by Krzysztof Wilczyński

Subject: Re: [PATCH] PCI: vmd: Remove duplicated include in vmd.c

Hi,

[...]
> --- a/drivers/pci/controller/vmd.c
> +++ b/drivers/pci/controller/vmd.c
> @@ -10,7 +10,6 @@
> #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>

Wan, thank you for reporting this!

Bjorn, the patch I sent earlier:

https://lore.kernel.org/all/[email protected]/

Accidentally left the include at the top that was intended to me moved to
be before the linux/msi.h to reflect previous order of the asm/device.h and
asm/msi.h had.

I must have forgotten to remove the one from the top later. Sincere
apologies!

I can send an update, or we can squeeze these two patches together. Sorry for
adding you more work to do.

Krzysztof

2021-11-04 14:42:08

by Bjorn Helgaas

Subject: Re: [PATCH] PCI: vmd: Remove duplicated include in vmd.c

On Thu, Nov 04, 2021 at 02:37:19AM -0400, Wan Jiabing wrote:
> Fix following checkincludes.pl warning:
> ./drivers/pci/controller/vmd.c: linux/device.h is included more than once.
>
> The include is in line 7. Remove the duplicated here.
>
> Signed-off-by: Wan Jiabing <[email protected]>

Squashed in, thanks!

> ---
> drivers/pci/controller/vmd.c | 1 -
> 1 file changed, 1 deletion(-)
>
> diff --git a/drivers/pci/controller/vmd.c b/drivers/pci/controller/vmd.c
> index b48d9998e324..a45e8e59d3d4 100644
> --- a/drivers/pci/controller/vmd.c
> +++ b/drivers/pci/controller/vmd.c
> @@ -10,7 +10,6 @@
> #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>
> --
> 2.20.1
>