| Message ID | 20200321113241.246190285@linutronix.de (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
| Series | Lock ordering documentation and annotation for lockdep | expand |
| Context | Check | Description |
|---|---|---|
| snowpatch_ozlabs/apply_patch | success | Successfully applied on branch powerpc/merge (a87b93bdf800a4d7a42d95683624a4516e516b4f) |
| snowpatch_ozlabs/checkpatch | warning | total: 0 errors, 1 warnings, 0 checks, 29 lines checked |
| snowpatch_ozlabs/needsstable | success | Patch has no Fixes tags |
On Sat, Mar 21, 2020 at 1:34 PM Thomas Gleixner <tglx@linutronix.de> wrote: > > From: Peter Zijlstra <peterz@infradead.org> > > In order to avoid future header hell, remove the inclusion of > proc_fs.h from acpi_bus.h. All it needs is a forward declaration of a > struct. > Acked-by: Andy Shevchenko <andy.shevchenko@gmail.com> # for PDx86 > Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> > Signed-off-by: Thomas Gleixner <tglx@linutronix.de> > Cc: Darren Hart <dvhart@infradead.org> > Cc: Andy Shevchenko <andy@infradead.org> > Cc: platform-driver-x86@vger.kernel.org > Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> > Cc: Zhang Rui <rui.zhang@intel.com> > Cc: "Rafael J. Wysocki" <rafael.j.wysocki@intel.com> > Cc: linux-pm@vger.kernel.org > Cc: Len Brown <lenb@kernel.org> > Cc: linux-acpi@vger.kernel.org > --- > drivers/platform/x86/dell-smo8800.c | 1 + > drivers/platform/x86/wmi.c | 1 + > drivers/thermal/intel/int340x_thermal/acpi_thermal_rel.c | 1 + > include/acpi/acpi_bus.h | 2 +- > 4 files changed, 4 insertions(+), 1 deletion(-) > > --- a/drivers/platform/x86/dell-smo8800.c > +++ b/drivers/platform/x86/dell-smo8800.c > @@ -16,6 +16,7 @@ > #include <linux/interrupt.h> > #include <linux/miscdevice.h> > #include <linux/uaccess.h> > +#include <linux/fs.h> > > struct smo8800_device { > u32 irq; /* acpi device irq */ > --- a/drivers/platform/x86/wmi.c > +++ b/drivers/platform/x86/wmi.c > @@ -29,6 +29,7 @@ > #include <linux/uaccess.h> > #include <linux/uuid.h> > #include <linux/wmi.h> > +#include <linux/fs.h> > #include <uapi/linux/wmi.h> > > ACPI_MODULE_NAME("wmi"); > --- a/drivers/thermal/intel/int340x_thermal/acpi_thermal_rel.c > +++ b/drivers/thermal/intel/int340x_thermal/acpi_thermal_rel.c > @@ -19,6 +19,7 @@ > #include <linux/acpi.h> > #include <linux/uaccess.h> > #include <linux/miscdevice.h> > +#include <linux/fs.h> > #include "acpi_thermal_rel.h" > > static acpi_handle acpi_thermal_rel_handle; > --- a/include/acpi/acpi_bus.h > +++ b/include/acpi/acpi_bus.h > @@ -80,7 +80,7 @@ bool acpi_dev_present(const char *hid, c > > #ifdef CONFIG_ACPI > > -#include <linux/proc_fs.h> > +struct proc_dir_entry; > > #define ACPI_BUS_FILE_ROOT "acpi" > extern struct proc_dir_entry *acpi_root_dir; > >
On Sat, Mar 21, 2020 at 12:35 PM Thomas Gleixner <tglx@linutronix.de> wrote: > > From: Peter Zijlstra <peterz@infradead.org> > > In order to avoid future header hell, remove the inclusion of > proc_fs.h from acpi_bus.h. All it needs is a forward declaration of a > struct. > > Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> > Signed-off-by: Thomas Gleixner <tglx@linutronix.de> > Cc: Darren Hart <dvhart@infradead.org> > Cc: Andy Shevchenko <andy@infradead.org> > Cc: platform-driver-x86@vger.kernel.org > Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> > Cc: Zhang Rui <rui.zhang@intel.com> > Cc: "Rafael J. Wysocki" <rafael.j.wysocki@intel.com> > Cc: linux-pm@vger.kernel.org > Cc: Len Brown <lenb@kernel.org> > Cc: linux-acpi@vger.kernel.org Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> > --- > drivers/platform/x86/dell-smo8800.c | 1 + > drivers/platform/x86/wmi.c | 1 + > drivers/thermal/intel/int340x_thermal/acpi_thermal_rel.c | 1 + > include/acpi/acpi_bus.h | 2 +- > 4 files changed, 4 insertions(+), 1 deletion(-) > > --- a/drivers/platform/x86/dell-smo8800.c > +++ b/drivers/platform/x86/dell-smo8800.c > @@ -16,6 +16,7 @@ > #include <linux/interrupt.h> > #include <linux/miscdevice.h> > #include <linux/uaccess.h> > +#include <linux/fs.h> > > struct smo8800_device { > u32 irq; /* acpi device irq */ > --- a/drivers/platform/x86/wmi.c > +++ b/drivers/platform/x86/wmi.c > @@ -29,6 +29,7 @@ > #include <linux/uaccess.h> > #include <linux/uuid.h> > #include <linux/wmi.h> > +#include <linux/fs.h> > #include <uapi/linux/wmi.h> > > ACPI_MODULE_NAME("wmi"); > --- a/drivers/thermal/intel/int340x_thermal/acpi_thermal_rel.c > +++ b/drivers/thermal/intel/int340x_thermal/acpi_thermal_rel.c > @@ -19,6 +19,7 @@ > #include <linux/acpi.h> > #include <linux/uaccess.h> > #include <linux/miscdevice.h> > +#include <linux/fs.h> > #include "acpi_thermal_rel.h" > > static acpi_handle acpi_thermal_rel_handle; > --- a/include/acpi/acpi_bus.h > +++ b/include/acpi/acpi_bus.h > @@ -80,7 +80,7 @@ bool acpi_dev_present(const char *hid, c > > #ifdef CONFIG_ACPI > > -#include <linux/proc_fs.h> > +struct proc_dir_entry; > > #define ACPI_BUS_FILE_ROOT "acpi" > extern struct proc_dir_entry *acpi_root_dir; > >
--- a/drivers/platform/x86/dell-smo8800.c +++ b/drivers/platform/x86/dell-smo8800.c @@ -16,6 +16,7 @@ #include <linux/interrupt.h> #include <linux/miscdevice.h> #include <linux/uaccess.h> +#include <linux/fs.h> struct smo8800_device { u32 irq; /* acpi device irq */ --- a/drivers/platform/x86/wmi.c +++ b/drivers/platform/x86/wmi.c @@ -29,6 +29,7 @@ #include <linux/uaccess.h> #include <linux/uuid.h> #include <linux/wmi.h> +#include <linux/fs.h> #include <uapi/linux/wmi.h> ACPI_MODULE_NAME("wmi"); --- a/drivers/thermal/intel/int340x_thermal/acpi_thermal_rel.c +++ b/drivers/thermal/intel/int340x_thermal/acpi_thermal_rel.c @@ -19,6 +19,7 @@ #include <linux/acpi.h> #include <linux/uaccess.h> #include <linux/miscdevice.h> +#include <linux/fs.h> #include "acpi_thermal_rel.h" static acpi_handle acpi_thermal_rel_handle; --- a/include/acpi/acpi_bus.h +++ b/include/acpi/acpi_bus.h @@ -80,7 +80,7 @@ bool acpi_dev_present(const char *hid, c #ifdef CONFIG_ACPI -#include <linux/proc_fs.h> +struct proc_dir_entry; #define ACPI_BUS_FILE_ROOT "acpi" extern struct proc_dir_entry *acpi_root_dir;