[PATCH] backports: backport ACPI_HANDLE(dev)

[PATCH] backports: backport ACPI_HANDLE(dev)

[Emmanuel Grumbach]

From: Ido Yariv <ido@wizery.com>

Depending on the kernel version it might either be defined in
linux/device.h or not at all, in which case DEVICE_ACPI_HANDLE is used
instead.

ACPI_HANDLE(dev) will be used by iwlwifi very soon.

Signed-off-by: Ido Yariv <idox.yariv@intel.com>
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
---
 backport/backport-include/linux/acpi.h | 40 ++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)
 create mode 100644 backport/backport-include/linux/acpi.h

diff --git a/backport/backport-include/linux/acpi.h b/backport/backport-include/linux/acpi.h
new file mode 100644
index 0000000..8a79143
--- /dev/null
+++ b/backport/backport-include/linux/acpi.h
@@ -0,0 +1,40 @@
+#ifndef __BACKPORT_LINUX_ACPI_H
+#define __BACKPORT_LINUX_ACPI_H
+#include_next <linux/acpi.h>
+#include_next <linux/device.h>
+#include <linux/version.h>
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,8,0)
+/*
+ * Backports
+ *
+ * commit 95f8a082b9b1ead0c2859f2a7b1ac91ff63d8765
+ * Author: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
+ * Date:   Wed Nov 21 00:21:50 2012 +0100
+ *
+ *     ACPI / driver core: Introduce struct acpi_dev_node and related macros
+ *
+ *     To avoid adding an ACPI handle pointer to struct device on
+ *     architectures that don't use ACPI, or generally when CONFIG_ACPI is
+ *     not set, in which cases that pointer is useless, define struct
+ *     acpi_dev_node that will contain the handle pointer if CONFIG_ACPI is
+ *     set and will be empty otherwise and use it to represent the ACPI
+ *     device node field in struct device.
+ *
+ *     In addition to that define macros for reading and setting the ACPI
+ *     handle of a device that don't generate code when CONFIG_ACPI is
+ *     unset.  Modify the ACPI subsystem to use those macros instead of
+ *     referring to the given device's ACPI handle directly.
+ *
+ *     Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
+ *     Reviewed-by: Mika Westerberg <mika.westerberg@linux.intel.com>
+ *     Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+ */
+#ifdef CONFIG_ACPI
+#define ACPI_HANDLE(dev) DEVICE_ACPI_HANDLE(dev)
+#else
+#define ACPI_HANDLE(dev) (NULL)
+#endif /* CONFIG_ACPI */
+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,8,0) */
+
+#endif /* __BACKPORT_LINUX_ACPI_H */
-- 
1.8.3.2

Re: [PATCH] backports: backport ACPI_HANDLE(dev)

[Johannes Berg]

Hmm, come to think of it...

On Tue, 2014-02-11 at 08:40 +0200, Emmanuel Grumbach wrote:

> +++ b/backport/backport-include/linux/acpi.h
> @@ -0,0 +1,40 @@
> +#ifndef __BACKPORT_LINUX_ACPI_H
> +#define __BACKPORT_LINUX_ACPI_H
> +#include_next <linux/acpi.h>
> +#include_next <linux/device.h>

That include_next is probably wrong, if you really need linux/device.h
you shouldn't use #include_next but a regular #include.

johannes

Re: [PATCH] backports: backport ACPI_HANDLE(dev)

[Ido Yariv]

Hi,

On Wed, Feb 12, 2014 at 12:10:11PM +0100, Johannes Berg wrote:
> Hmm, come to think of it...
> 
> On Tue, 2014-02-11 at 08:40 +0200, Emmanuel Grumbach wrote:
> 
> > +++ b/backport/backport-include/linux/acpi.h
> > @@ -0,0 +1,40 @@
> > +#ifndef __BACKPORT_LINUX_ACPI_H
> > +#define __BACKPORT_LINUX_ACPI_H
> > +#include_next <linux/acpi.h>
> > +#include_next <linux/device.h>
> 
> That include_next is probably wrong, if you really need linux/device.h
> you shouldn't use #include_next but a regular #include.

My intention was to load the kernel's device.h and not backport's. The
reason was that some definitions which are now part of acpi.h were
defined by device.h in the past.

That being said, backport's device.h includes the kernel's version, so
this can be modified to a regular #include and work just as well.

Cheers,
Ido.

Re: [PATCH] backports: backport ACPI_HANDLE(dev)

[Johannes Berg]

On Wed, 2014-02-12 at 18:44 -0500, Ido Yariv wrote:

> > > +#include_next <linux/device.h>
> > 
> > That include_next is probably wrong, if you really need linux/device.h
> > you shouldn't use #include_next but a regular #include.
> 
> My intention was to load the kernel's device.h and not backport's. The
> reason was that some definitions which are now part of acpi.h were
> defined by device.h in the past.
> 
> That being said, backport's device.h includes the kernel's version, so
> this can be modified to a regular #include and work just as well.

Right. I just think it seems odd in terms of backport header style, and
occasionally some backport header depends on some other backported
thing, so a plain #include is the right thing at least in those cases.
Not to mention that #include_next is a gcc-specific hack :)

johannes

[PATCH v2] backports: backport ACPI_HANDLE(dev)

[Ido Yariv]

In earlier kernel versions the define for retrieving the acpi handle was
called DEVICE_ACPI_HANDLE, so just use it.

Signed-off-by: Ido Yariv <idox.yariv@intel.com>
---
Changes from v1:
- device.h is implicitly included by acpi.h in earlier kernel versions as well,
  so no need to include it at all

 backport/backport-include/linux/acpi.h | 39 ++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 backport/backport-include/linux/acpi.h

diff --git a/backport/backport-include/linux/acpi.h b/backport/backport-include/linux/acpi.h
new file mode 100644
index 0000000..506df15
--- /dev/null
+++ b/backport/backport-include/linux/acpi.h
@@ -0,0 +1,39 @@
+#ifndef __BACKPORT_LINUX_ACPI_H
+#define __BACKPORT_LINUX_ACPI_H
+#include_next <linux/acpi.h>
+#include <linux/version.h>
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,8,0)
+/*
+ * Backports
+ *
+ * commit 95f8a082b9b1ead0c2859f2a7b1ac91ff63d8765
+ * Author: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
+ * Date:   Wed Nov 21 00:21:50 2012 +0100
+ *
+ *     ACPI / driver core: Introduce struct acpi_dev_node and related macros
+ *
+ *     To avoid adding an ACPI handle pointer to struct device on
+ *     architectures that don't use ACPI, or generally when CONFIG_ACPI is
+ *     not set, in which cases that pointer is useless, define struct
+ *     acpi_dev_node that will contain the handle pointer if CONFIG_ACPI is
+ *     set and will be empty otherwise and use it to represent the ACPI
+ *     device node field in struct device.
+ *
+ *     In addition to that define macros for reading and setting the ACPI
+ *     handle of a device that don't generate code when CONFIG_ACPI is
+ *     unset.  Modify the ACPI subsystem to use those macros instead of
+ *     referring to the given device's ACPI handle directly.
+ *
+ *     Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
+ *     Reviewed-by: Mika Westerberg <mika.westerberg@linux.intel.com>
+ *     Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+ */
+#ifdef CONFIG_ACPI
+#define ACPI_HANDLE(dev) DEVICE_ACPI_HANDLE(dev)
+#else
+#define ACPI_HANDLE(dev) (NULL)
+#endif /* CONFIG_ACPI */
+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,8,0) */
+
+#endif /* __BACKPORT_LINUX_ACPI_H */
-- 
1.8.5.3