frodovdr/dddvb
1
0
Fork 0
mirror of https://github.com/DigitalDevices/dddvb.git synced 2023-10-10 13:37:43 +02:00
Code Issues Releases Wiki Activity

compiling for kernel 4.12.x

Browse Source
This commit is contained in:
mvoelkel 2017-09-25 19:20:17 +02:00
parent 41897e48c8
commit f84d196a1e
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ddbridge/ddbridge-core.c
View File

@ -252,7 +252,7 @@ static int dma_alloc(struct pci_dev *pdev, struct ddb_dma *dma, int dir)
return 0; return 0;
for (i = 0; i < dma->num; i++) { for (i = 0; i < dma->num; i++) {
if (alt_dma) { if (alt_dma) {
#if (KERNEL_VERSION(4, 12, 0) >= LINUX_VERSION_CODE) #if (KERNEL_VERSION(4, 13, 0) > LINUX_VERSION_CODE)
dma->vbuf[i] = kmalloc(dma->size, __GFP_REPEAT); dma->vbuf[i] = kmalloc(dma->size, __GFP_REPEAT);
#else #else
dma->vbuf[i] = kmalloc(dma->size, __GFP_RETRY_MAYFAIL); dma->vbuf[i] = kmalloc(dma->size, __GFP_RETRY_MAYFAIL);
@ -3362,7 +3362,7 @@ static const struct file_operations ddb_fops = {
.release = ddb_release, .release = ddb_release,
}; };
#if (KERNEL_VERSION(3, 4, 0) >= LINUX_VERSION_CODE) #if (KERNEL_VERSION(3, 4, 0) > LINUX_VERSION_CODE)
static char *ddb_devnode(struct device *device, mode_t *mode) static char *ddb_devnode(struct device *device, mode_t *mode)
#else #else
static char *ddb_devnode(struct device *device, umode_t *mode) static char *ddb_devnode(struct device *device, umode_t *mode)

6
ddbridge/ddbridge-main.c
View File

@ -86,7 +86,7 @@ static void __devexit ddb_remove(struct pci_dev *pdev)
pci_disable_device(pdev); pci_disable_device(pdev);
} }
#if (KERNEL_VERSION(3, 8, 0) < LINUX_VERSION_CODE) #if (KERNEL_VERSION(3, 8, 0) <= LINUX_VERSION_CODE)
#define __devinit #define __devinit
#define __devinitdata #define __devinitdata
#endif #endif
@ -97,8 +97,8 @@ static int __devinit ddb_irq_msi(struct ddb *dev, int nr)
#ifdef CONFIG_PCI_MSI #ifdef CONFIG_PCI_MSI
if (msi && pci_msi_enabled()) { if (msi && pci_msi_enabled()) {
#if (KERNEL_VERSION(3, 15, 0) < LINUX_VERSION_CODE) #if (KERNEL_VERSION(3, 15, 0) <= LINUX_VERSION_CODE)
#if (KERNEL_VERSION(4, 11, 0) < LINUX_VERSION_CODE) #if (KERNEL_VERSION(4, 11, 0) <= LINUX_VERSION_CODE)
stat = pci_alloc_irq_vectors(dev->pdev, 1, nr, PCI_IRQ_MSI); stat = pci_alloc_irq_vectors(dev->pdev, 1, nr, PCI_IRQ_MSI);
#else #else
stat = pci_enable_msi_range(dev->pdev, 1, nr); stat = pci_enable_msi_range(dev->pdev, 1, nr);

2
ddbridge/ddbridge.h
View File

@ -28,7 +28,7 @@
#include <linux/version.h> #include <linux/version.h>
#if (KERNEL_VERSION(3, 8, 0) < LINUX_VERSION_CODE) #if (KERNEL_VERSION(3, 8, 0) <= LINUX_VERSION_CODE)
#define __devexit #define __devexit
#define __devinit #define __devinit
#define __devinitconst #define __devinitconst