FGCOM/dahdi-linux
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

voicebus, wcaxx, wct4xxp: Remove include of pci-aspm.h

Browse Source 
Linux 5.4, in commit  (7ce2e76a0420801fb4b53b9e685094 "PCI: Move ASPM
declarations to linux/pci.h") [1], removed pci-aspm.h.

This commit removes the global include of pci-aspm.h in include/dahdi/kernel.h
(because it only pertains to certain drivers), and moves the conditional include
into only the drivers that need it.

[1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=7ce2e76a0420801fb4b53b9e685094

Signed-off-by: Shaun Ruffell <sruffell@sruffell.net>
This commit is contained in:
Shaun Ruffell 2019-09-24 19:51:22 -05:00
parent d07c4545ec
commit 45ac6a30f9
4 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/dahdi/voicebus/voicebus.h
View File

@ -64,7 +64,11 @@
* platform does not support it. * platform does not support it.
* *
*/ */
#undef CONFIG_VOICEBUS_DISABLE_ASPM #ifdef CONFIG_VOICEBUS_DISABLE_ASPM
#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 4, 0)
#include <linux/pci-aspm.h>
#endif
#endif
/* Define this to use a FIFO for the software echocan reference. /* Define this to use a FIFO for the software echocan reference.
* (experimental) */ * (experimental) */

6
drivers/dahdi/wcaxx-base.c
View File

@ -67,6 +67,12 @@
#include "wcxb_spi.h" #include "wcxb_spi.h"
#include "wcxb_flash.h" #include "wcxb_flash.h"
#ifdef CONFIG_VOICEBUS_DISABLE_ASPM
#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 4, 0)
#include <linux/pci-aspm.h>
#endif
#endif
/*! /*!
* \brief Default ringer debounce (in ms) * \brief Default ringer debounce (in ms)
*/ */

6
drivers/dahdi/wct4xxp/base.c
View File

@ -87,6 +87,12 @@
*/ */
/* #define CONFIG_WCT4XXP_DISABLE_ASPM */ /* #define CONFIG_WCT4XXP_DISABLE_ASPM */
#ifdef CONFIG_WCT4XXP_DISABLE_ASPM
#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 4, 0)
#include <linux/pci-aspm.h>
#endif
#endif
#if defined(CONFIG_FORCE_EXTENDED_RESET) && defined(CONFIG_NOEXTENDED_RESET) #if defined(CONFIG_FORCE_EXTENDED_RESET) && defined(CONFIG_NOEXTENDED_RESET)
#error "You cannot define both CONFIG_FORCE_EXTENDED_RESET and " \ #error "You cannot define both CONFIG_FORCE_EXTENDED_RESET and " \
"CONFIG_NOEXTENDED_RESET." "CONFIG_NOEXTENDED_RESET."

4
include/dahdi/kernel.h
View File

@ -58,10 +58,6 @@
#include <linux/poll.h> #include <linux/poll.h>
#ifdef CONFIG_PCI
#include <linux/pci-aspm.h>
#endif
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29) #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
#define HAVE_NET_DEVICE_OPS #define HAVE_NET_DEVICE_OPS
#endif #endif