Commit
6055fae8aceee41471edfd1876e5617d16e028fe
Exists in
master
and in
39 other branches
8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y
hwmon: Include <linux/io.h> instead of <asm/io.h>
Drivers should be including <linux/io.h> instead of <asm/io.h>.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Alistair John Strachan <alistair@devzero.co.uk>
Cc: Nicolas Boichat <nicolas@boichat.ch>
Cc: Juerg Haefliger <juergh@gmail.com>
Cc: Frank Seidel <frank@f-seidel.de>
Acked-by: Jim Cromie <jim.cromie@gmail.com>
Cc: "Mark M. Hoffman" <mhoffman@lightlink.com>
Cc: Roger Lucas <vt8231@hiddenengine.co.uk>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Showing
19 changed files
with
19 additions
and
20 deletions
Side-by-side Diff
... |
... |
@@ -32,7 +32,7 @@ |
32
|
32 |
#include <linux/hwmon.h> |
33
|
33 |
#include <linux/hwmon-sysfs.h> |
34
|
34 |
#include <linux/dmi.h> |
35
|
|
-#include <asm/io.h> |
|
35 |
+#include <linux/io.h> |
36
|
36 |
|
37
|
37 |
/* Banks */ |
38
|
38 |
#define ABIT_UGURU_ALARM_BANK 0x20 /* 1x 3 bytes */ |
... |
... |
@@ -34,7 +34,7 @@ |
34
|
34 |
#include <linux/hwmon.h> |
35
|
35 |
#include <linux/hwmon-sysfs.h> |
36
|
36 |
#include <linux/dmi.h> |
37
|
|
-#include <asm/io.h> |
|
37 |
+#include <linux/io.h> |
38
|
38 |
|
39
|
39 |
/* uGuru3 bank addresses */ |
40
|
40 |
#define ABIT_UGURU3_SETTINGS_BANK 0x01 |
... |
... |
@@ -35,7 +35,7 @@ |
35
|
35 |
#include <linux/dmi.h> |
36
|
36 |
#include <linux/mutex.h> |
37
|
37 |
#include <linux/hwmon-sysfs.h> |
38
|
|
-#include <asm/io.h> |
|
38 |
+#include <linux/io.h> |
39
|
39 |
#include <linux/leds.h> |
40
|
40 |
#include <linux/hwmon.h> |
41
|
41 |
#include <linux/workqueue.h> |
... |
... |
@@ -35,7 +35,7 @@ |
35
|
35 |
#include <linux/err.h> |
36
|
36 |
#include <linux/mutex.h> |
37
|
37 |
#include <linux/acpi.h> |
38
|
|
-#include <asm/io.h> |
|
38 |
+#include <linux/io.h> |
39
|
39 |
|
40
|
40 |
/* ISA device, if found */ |
41
|
41 |
static struct platform_device *pdev; |
... |
... |
@@ -40,7 +40,7 @@ |
40
|
40 |
#include <linux/sysfs.h> |
41
|
41 |
#include <linux/ioport.h> |
42
|
42 |
#include <linux/acpi.h> |
43
|
|
-#include <asm/io.h> |
|
43 |
+#include <linux/io.h> |
44
|
44 |
|
45
|
45 |
static unsigned short force_id; |
46
|
46 |
module_param(force_id, ushort, 0); |
... |
... |
@@ -35,8 +35,7 @@ |
35
|
35 |
#include <linux/timer.h> |
36
|
36 |
#include <linux/dmi.h> |
37
|
37 |
#include <linux/jiffies.h> |
38
|
|
- |
39
|
|
-#include <asm/io.h> |
|
38 |
+#include <linux/io.h> |
40
|
39 |
|
41
|
40 |
#define HDAPS_LOW_PORT 0x1600 /* first port used by hdaps */ |
42
|
41 |
#define HDAPS_NR_PORTS 0x30 /* number of ports: 0x1600 - 0x162f */ |
... |
... |
@@ -50,7 +50,7 @@ |
50
|
50 |
#include <linux/string.h> |
51
|
51 |
#include <linux/dmi.h> |
52
|
52 |
#include <linux/acpi.h> |
53
|
|
-#include <asm/io.h> |
|
53 |
+#include <linux/io.h> |
54
|
54 |
|
55
|
55 |
#define DRVNAME "it87" |
56
|
56 |
|
... |
... |
@@ -31,7 +31,7 @@ |
31
|
31 |
#include <linux/hwmon-sysfs.h> |
32
|
32 |
#include <linux/err.h> |
33
|
33 |
#include <linux/mutex.h> |
34
|
|
-#include <asm/io.h> |
|
34 |
+#include <linux/io.h> |
35
|
35 |
|
36
|
36 |
/* ISA device, if found */ |
37
|
37 |
static struct platform_device *pdev; |
... |
... |
@@ -44,7 +44,7 @@ |
44
|
44 |
#include <linux/err.h> |
45
|
45 |
#include <linux/mutex.h> |
46
|
46 |
#include <linux/acpi.h> |
47
|
|
-#include <asm/io.h> |
|
47 |
+#include <linux/io.h> |
48
|
48 |
|
49
|
49 |
static u8 devid; |
50
|
50 |
static struct platform_device *pdev; |
... |
... |
@@ -33,7 +33,7 @@ |
33
|
33 |
#include <linux/sysfs.h> |
34
|
34 |
#include <linux/ioport.h> |
35
|
35 |
#include <linux/acpi.h> |
36
|
|
-#include <asm/io.h> |
|
36 |
+#include <linux/io.h> |
37
|
37 |
|
38
|
38 |
static unsigned short force_id; |
39
|
39 |
module_param(force_id, ushort, 0); |
... |
... |
@@ -63,7 +63,7 @@ |
63
|
63 |
#include <linux/mutex.h> |
64
|
64 |
#include <linux/sysfs.h> |
65
|
65 |
#include <linux/acpi.h> |
66
|
|
-#include <asm/io.h> |
|
66 |
+#include <linux/io.h> |
67
|
67 |
|
68
|
68 |
|
69
|
69 |
/* If force_addr is set to anything different from 0, we forcibly enable |
... |
... |
@@ -37,7 +37,7 @@ |
37
|
37 |
#include <linux/init.h> |
38
|
38 |
#include <linux/mutex.h> |
39
|
39 |
#include <linux/acpi.h> |
40
|
|
-#include <asm/io.h> |
|
40 |
+#include <linux/io.h> |
41
|
41 |
|
42
|
42 |
static unsigned short force_id; |
43
|
43 |
module_param(force_id, ushort, 0); |
... |
... |
@@ -38,7 +38,7 @@ |
38
|
38 |
#include <linux/mutex.h> |
39
|
39 |
#include <linux/sysfs.h> |
40
|
40 |
#include <linux/acpi.h> |
41
|
|
-#include <asm/io.h> |
|
41 |
+#include <linux/io.h> |
42
|
42 |
|
43
|
43 |
static unsigned short force_id; |
44
|
44 |
module_param(force_id, ushort, 0); |
... |
... |
@@ -42,7 +42,7 @@ |
42
|
42 |
#include <linux/mutex.h> |
43
|
43 |
#include <linux/sysfs.h> |
44
|
44 |
#include <linux/acpi.h> |
45
|
|
-#include <asm/io.h> |
|
45 |
+#include <linux/io.h> |
46
|
46 |
|
47
|
47 |
|
48
|
48 |
/* If force_addr is set to anything different from 0, we forcibly enable |
... |
... |
@@ -33,7 +33,7 @@ |
33
|
33 |
#include <linux/mutex.h> |
34
|
34 |
#include <linux/ioport.h> |
35
|
35 |
#include <linux/acpi.h> |
36
|
|
-#include <asm/io.h> |
|
36 |
+#include <linux/io.h> |
37
|
37 |
|
38
|
38 |
static int uch_config = -1; |
39
|
39 |
module_param(uch_config, int, 0); |
... |
... |
@@ -36,7 +36,7 @@ |
36
|
36 |
#include <linux/err.h> |
37
|
37 |
#include <linux/mutex.h> |
38
|
38 |
#include <linux/acpi.h> |
39
|
|
-#include <asm/io.h> |
|
39 |
+#include <linux/io.h> |
40
|
40 |
|
41
|
41 |
static int force_addr; |
42
|
42 |
module_param(force_addr, int, 0); |
... |
... |
@@ -51,7 +51,7 @@ |
51
|
51 |
#include <linux/err.h> |
52
|
52 |
#include <linux/mutex.h> |
53
|
53 |
#include <linux/acpi.h> |
54
|
|
-#include <asm/io.h> |
|
54 |
+#include <linux/io.h> |
55
|
55 |
#include "lm75.h" |
56
|
56 |
|
57
|
57 |
enum kinds { w83627ehf, w83627dhg, w83627dhg_p, w83667hg }; |
... |
... |
@@ -51,7 +51,7 @@ |
51
|
51 |
#include <linux/mutex.h> |
52
|
52 |
#include <linux/ioport.h> |
53
|
53 |
#include <linux/acpi.h> |
54
|
|
-#include <asm/io.h> |
|
54 |
+#include <linux/io.h> |
55
|
55 |
#include "lm75.h" |
56
|
56 |
|
57
|
57 |
static struct platform_device *pdev; |
... |
... |
@@ -48,7 +48,7 @@ |
48
|
48 |
#ifdef CONFIG_ISA |
49
|
49 |
#include <linux/platform_device.h> |
50
|
50 |
#include <linux/ioport.h> |
51
|
|
-#include <asm/io.h> |
|
51 |
+#include <linux/io.h> |
52
|
52 |
#endif |
53
|
53 |
|
54
|
54 |
#include "lm75.h" |