1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
|
commit f0a726b7fe5a76d51f81bfeeb92da5b8807d47f5
Author: Bruno Santos <brunomanuelsantos@tecnico.ulisboa.pt>
Date: Sun Jun 21 18:36:51 2020 +0100
Fix use of deprecated ioremap_nocache()
The kernel has provided non-cached semantics by default since v2.6. And
the additional interface has been removed since early 2020 from the
kernel.
diff --git a/SocketCAN - Linux (V1.1.148.0)/can-ibxxx_socketcan/ixx_pci_ib_active.c b/SocketCAN - Linux (V1.1.148.0)/can-ibxxx_socketcan/ixx_pci_ib_active.c
index cd0c50a..1e698c8 100644
--- a/SocketCAN - Linux (V1.1.148.0)/can-ibxxx_socketcan/ixx_pci_ib_active.c
+++ b/SocketCAN - Linux (V1.1.148.0)/can-ibxxx_socketcan/ixx_pci_ib_active.c
@@ -1854,17 +1854,17 @@ static int ixx_act_ib_xxx_probe(struct pci_dev *pdev,
intf->memlen = pci_resource_len(pdev, 2);
request_mem_region(intf->reg1add, intf->reg1len, "IXXAT PCI Registers");
- intf->reg1vadd = ioremap_nocache(intf->reg1add, intf->reg1len);
+ intf->reg1vadd = ioremap(intf->reg1add, intf->reg1len);
if (!intf->reg1vadd) {
- printk("reg1vadd ioremap_nocache failed\n");
+ printk("reg1vadd ioremap failed\n");
err = -ENOBUFS;
goto release_reg1;
}
request_mem_region(intf->memadd, intf->memlen, "IXXAT PCI Memory");
- intf->memvadd = ioremap_nocache(intf->memadd, intf->memlen);
+ intf->memvadd = ioremap(intf->memadd, intf->memlen);
if (!intf->memvadd) {
- printk("memvadd ioremap_nocache failed\n");
+ printk("memvadd ioremap failed\n");
err = -ENOBUFS;
goto release_memreg;
}
diff --git a/SocketCAN - Linux (V1.1.148.0)/can-ibxxx_socketcan/ixx_pci_ib_fd_passive.c b/SocketCAN - Linux (V1.1.148.0)/can-ibxxx_socketcan/ixx_pci_ib_fd_passive.c
index d3a4da1..7a3514f 100644
--- a/SocketCAN - Linux (V1.1.148.0)/can-ibxxx_socketcan/ixx_pci_ib_fd_passive.c
+++ b/SocketCAN - Linux (V1.1.148.0)/can-ibxxx_socketcan/ixx_pci_ib_fd_passive.c
@@ -1193,17 +1193,17 @@ static int ixx_pas_ib_fd_xxx_probe(struct pci_dev *pdev,
intf->memlen = pci_resource_len(pdev, 2);
request_mem_region(intf->memadd, intf->memlen, "IXXAT PCI Memory");
- intf->memvadd = ioremap_nocache(intf->memadd, intf->memlen);
+ intf->memvadd = ioremap(intf->memadd, intf->memlen);
if (!intf->memvadd) {
- printk("memvadd ioremap_nocache failed\n");
+ printk("memvadd ioremap failed\n");
err = -ENOBUFS;
goto release_memreg;
}
request_mem_region(intf->reg1add, intf->reg1len, "IXXAT PCI Registers");
- intf->reg1vadd = ioremap_nocache(intf->reg1add, intf->reg1len);
+ intf->reg1vadd = ioremap(intf->reg1add, intf->reg1len);
if (!intf->reg1vadd) {
- printk("reg1vadd ioremap_nocache failed\n");
+ printk("reg1vadd ioremap failed\n");
err = -ENOBUFS;
goto release_reg1;
}
diff --git a/SocketCAN - Linux (V1.1.148.0)/can-ibxxx_socketcan/ixx_pci_ib_passive.c b/SocketCAN - Linux (V1.1.148.0)/can-ibxxx_socketcan/ixx_pci_ib_passive.c
index 27b2b7d..fb08c03 100644
--- a/SocketCAN - Linux (V1.1.148.0)/can-ibxxx_socketcan/ixx_pci_ib_passive.c
+++ b/SocketCAN - Linux (V1.1.148.0)/can-ibxxx_socketcan/ixx_pci_ib_passive.c
@@ -1221,17 +1221,17 @@ static int ixx_pas_ib_xxx_probe(struct pci_dev *pdev,
intf->memlen = pci_resource_len(pdev, 2);
request_mem_region(intf->memadd, intf->memlen, "IXXAT PCI Memory");
- intf->memvadd = ioremap_nocache(intf->memadd, intf->memlen);
+ intf->memvadd = ioremap(intf->memadd, intf->memlen);
if (!intf->memvadd) {
- printk("memvadd ioremap_nocache failed\n");
+ printk("memvadd ioremap failed\n");
err = -ENOBUFS;
goto release_memreg;
}
request_mem_region(intf->reg1add, intf->reg1len, "IXXAT PCI Registers");
- intf->reg1vadd = ioremap_nocache(intf->reg1add, intf->reg1len);
+ intf->reg1vadd = ioremap(intf->reg1add, intf->reg1len);
if (!intf->reg1vadd) {
- printk("reg1vadd ioremap_nocache failed\n");
+ printk("reg1vadd ioremap failed\n");
err = -ENOBUFS;
goto release_reg1;
}
|