| Message ID | 20211013003145.1107148-1-kw@linux.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | ef0955e18454734b5ee81489cdeebd6d6b0999be |
| Delegated to: | Bjorn Helgaas |
| Headers | show |
| Series | [1/2] PCI: vmd: Use preferred header files linux/device.h and linux/msi.h | expand |
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>
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 >
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
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(-)