shark/bbswitch-g14
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Define ACPI_HANDLE macro for older versions

Browse Source 
ACPI_HANDLE was added in Linux 3.8,
DEVICE_ACPI_HANDLE is gone in Linux 3.13. Move the definition a bit
higher, maybe we can reuse it later.
This commit is contained in:
Peter Wu 2016-06-06 02:20:29 +02:00
parent 0c38f97c3a
commit 2ccf2d7e31
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
bbswitch.c
View File

@ -35,6 +35,11 @@
#include <linux/suspend.h> #include <linux/suspend.h>
#include <linux/seq_file.h> #include <linux/seq_file.h>
#include <linux/pm_runtime.h> #include <linux/pm_runtime.h>
#include <linux/version.h>
#if LINUX_VERSION_CODE < KERNEL_VERSION(3,8,0)
# define ACPI_HANDLE DEVICE_ACPI_HANDLE
#endif
#define BBSWITCH_VERSION "0.8" #define BBSWITCH_VERSION "0.8"
@ -403,13 +408,7 @@ static int __init bbswitch_init(void) {
pci_class != PCI_CLASS_DISPLAY_3D) pci_class != PCI_CLASS_DISPLAY_3D)
continue; continue;
#ifdef ACPI_HANDLE
/* since Linux 3.8 */
handle = ACPI_HANDLE(&pdev->dev); handle = ACPI_HANDLE(&pdev->dev);
#else
/* removed since Linux 3.13 */
handle = DEVICE_ACPI_HANDLE(&pdev->dev);
#endif
if (!handle) { if (!handle) {
pr_warn("cannot find ACPI handle for VGA device %s\n", pr_warn("cannot find ACPI handle for VGA device %s\n",
dev_name(&pdev->dev)); dev_name(&pdev->dev));