diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2009-02-25 15:36:14 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-04-03 17:54:24 -0400 |
commit | 441926795d77a3da1be99dca1720130cf46c728b (patch) | |
tree | 90f966df71f665c7afcbed9a869f537bd9f04096 | |
parent | d52b3d9c720a88d9268c92060740ed0cf87795d5 (diff) |
Staging: heci: remove kcompat.h
It's not needed now that we are now in the main kernel tree.
Cc: Anas Nashif <anas.nashif@intel.com>
Cc: Marcin Obara <marcin.obara@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r-- | drivers/staging/heci/heci_init.c | 1 | ||||
-rw-r--r-- | drivers/staging/heci/heci_main.c | 1 | ||||
-rw-r--r-- | drivers/staging/heci/interrupt.c | 1 | ||||
-rw-r--r-- | drivers/staging/heci/io_heci.c | 1 | ||||
-rw-r--r-- | drivers/staging/heci/kcompat.h | 150 |
5 files changed, 0 insertions, 154 deletions
diff --git a/drivers/staging/heci/heci_init.c b/drivers/staging/heci/heci_init.c index c2d88c3009b1..dbc5af03fd59 100644 --- a/drivers/staging/heci/heci_init.c +++ b/drivers/staging/heci/heci_init.c | |||
@@ -48,7 +48,6 @@ | |||
48 | #include <linux/wait.h> | 48 | #include <linux/wait.h> |
49 | #include <linux/delay.h> | 49 | #include <linux/delay.h> |
50 | #include <linux/kthread.h> | 50 | #include <linux/kthread.h> |
51 | #include "kcompat.h" | ||
52 | 51 | ||
53 | #include "heci_data_structures.h" | 52 | #include "heci_data_structures.h" |
54 | #include "heci_interface.h" | 53 | #include "heci_interface.h" |
diff --git a/drivers/staging/heci/heci_main.c b/drivers/staging/heci/heci_main.c index a24cd2b3774e..6782fe9f785a 100644 --- a/drivers/staging/heci/heci_main.c +++ b/drivers/staging/heci/heci_main.c | |||
@@ -58,7 +58,6 @@ | |||
58 | #include <linux/device.h> | 58 | #include <linux/device.h> |
59 | #include <linux/unistd.h> | 59 | #include <linux/unistd.h> |
60 | #include <linux/kthread.h> | 60 | #include <linux/kthread.h> |
61 | #include "kcompat.h" | ||
62 | 61 | ||
63 | #include "heci.h" | 62 | #include "heci.h" |
64 | #include "heci_interface.h" | 63 | #include "heci_interface.h" |
diff --git a/drivers/staging/heci/interrupt.c b/drivers/staging/heci/interrupt.c index 54fcf90807d6..aacd26243988 100644 --- a/drivers/staging/heci/interrupt.c +++ b/drivers/staging/heci/interrupt.c | |||
@@ -39,7 +39,6 @@ | |||
39 | */ | 39 | */ |
40 | 40 | ||
41 | #include <linux/kthread.h> | 41 | #include <linux/kthread.h> |
42 | #include "kcompat.h" | ||
43 | 42 | ||
44 | #include "heci.h" | 43 | #include "heci.h" |
45 | #include "heci_interface.h" | 44 | #include "heci_interface.h" |
diff --git a/drivers/staging/heci/io_heci.c b/drivers/staging/heci/io_heci.c index 2379e7fcafb0..d7e06484f96b 100644 --- a/drivers/staging/heci/io_heci.c +++ b/drivers/staging/heci/io_heci.c | |||
@@ -57,7 +57,6 @@ | |||
57 | #include <linux/list.h> | 57 | #include <linux/list.h> |
58 | #include <linux/unistd.h> | 58 | #include <linux/unistd.h> |
59 | #include <linux/delay.h> | 59 | #include <linux/delay.h> |
60 | #include "kcompat.h" | ||
61 | 60 | ||
62 | #include "heci_data_structures.h" | 61 | #include "heci_data_structures.h" |
63 | #include "heci.h" | 62 | #include "heci.h" |
diff --git a/drivers/staging/heci/kcompat.h b/drivers/staging/heci/kcompat.h deleted file mode 100644 index 339b3ae22c04..000000000000 --- a/drivers/staging/heci/kcompat.h +++ /dev/null | |||
@@ -1,150 +0,0 @@ | |||
1 | /* | ||
2 | * Part of Intel(R) Manageability Engine Interface Linux driver | ||
3 | * | ||
4 | * Copyright (c) 2003 - 2008 Intel Corp. | ||
5 | * All rights reserved. | ||
6 | * | ||
7 | * Redistribution and use in source and binary forms, with or without | ||
8 | * modification, are permitted provided that the following conditions | ||
9 | * are met: | ||
10 | * 1. Redistributions of source code must retain the above copyright | ||
11 | * notice, this list of conditions, and the following disclaimer, | ||
12 | * without modification. | ||
13 | * 2. Redistributions in binary form must reproduce at minimum a disclaimer | ||
14 | * substantially similar to the "NO WARRANTY" disclaimer below | ||
15 | * ("Disclaimer") and any redistribution must be conditioned upon | ||
16 | * including a substantially similar Disclaimer requirement for further | ||
17 | * binary redistribution. | ||
18 | * 3. Neither the names of the above-listed copyright holders nor the names | ||
19 | * of any contributors may be used to endorse or promote products derived | ||
20 | * from this software without specific prior written permission. | ||
21 | * | ||
22 | * Alternatively, this software may be distributed under the terms of the | ||
23 | * GNU General Public License ("GPL") version 2 as published by the Free | ||
24 | * Software Foundation. | ||
25 | * | ||
26 | * NO WARRANTY | ||
27 | * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS | ||
28 | * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT | ||
29 | * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR | ||
30 | * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT | ||
31 | * HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, OR CONSEQUENTIAL | ||
32 | * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS | ||
33 | * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | ||
34 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, | ||
35 | * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING | ||
36 | * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | ||
37 | * POSSIBILITY OF SUCH DAMAGES. | ||
38 | * | ||
39 | */ | ||
40 | |||
41 | #ifndef _KCOMPAT_H_ | ||
42 | #define _KCOMPAT_H_ | ||
43 | |||
44 | #include <linux/version.h> | ||
45 | #include <linux/init.h> | ||
46 | #include <linux/types.h> | ||
47 | #include <linux/errno.h> | ||
48 | #include <linux/module.h> | ||
49 | #include <linux/interrupt.h> | ||
50 | #include <asm/io.h> | ||
51 | |||
52 | #if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 27)) | ||
53 | #if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 18)) | ||
54 | #define device_create(cls, parent, devt, devpar, fmt...) class_device_create(cls, parent, devt, NULL, ## fmt) | ||
55 | #define HECI_DEVICE_CREATE(cls, parent, devt, devpar, fmt...) class_device_create(cls, parent, devt, NULL, ## fmt) | ||
56 | #define device_destroy class_device_destroy | ||
57 | #else | ||
58 | #define HECI_DEVICE_CREATE(cls, parent, devt, devpar, fmt...) device_create(cls, parent, devt, ## fmt) | ||
59 | #endif | ||
60 | #endif | ||
61 | |||
62 | |||
63 | #if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 23)) | ||
64 | #define HECI_TASK_NONFREEZABLE current->flags |= PF_NOFREEZE; | ||
65 | #endif | ||
66 | |||
67 | |||
68 | #if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 17)) | ||
69 | #include <asm/uaccess.h> | ||
70 | #else | ||
71 | #include <linux/uaccess.h> | ||
72 | #endif | ||
73 | |||
74 | /*****************************************************************************/ | ||
75 | #if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 20)) | ||
76 | #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 5, 28)) | ||
77 | #undef INIT_WORK | ||
78 | #define INIT_WORK(_work, _func) \ | ||
79 | do { \ | ||
80 | INIT_LIST_HEAD(&(_work)->entry); \ | ||
81 | (_work)->pending = 0; \ | ||
82 | (_work)->func = (void (*)(void *))_func; \ | ||
83 | (_work)->data = _work; \ | ||
84 | init_timer(&(_work)->timer); \ | ||
85 | } while (0) | ||
86 | #undef PREPARE_WORK | ||
87 | #define PREPARE_WORK(_work, _func) \ | ||
88 | do { \ | ||
89 | (_work)->func = (void (*)(void *))_func; \ | ||
90 | (_work)->data = _work; \ | ||
91 | } while (0) | ||
92 | |||
93 | #endif | ||
94 | |||
95 | #ifndef round_jiffies | ||
96 | #define round_jiffies(x) x | ||
97 | #endif | ||
98 | |||
99 | #endif /* < 2.6.20 */ | ||
100 | |||
101 | |||
102 | /*****************************************************************************/ | ||
103 | #if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 18)) | ||
104 | |||
105 | #ifndef IRQF_PROBE_SHARED | ||
106 | #ifdef SA_PROBEIRQ | ||
107 | #define IRQF_PROBE_SHARED SA_PROBEIRQ | ||
108 | #else | ||
109 | #define IRQF_PROBE_SHARED 0 | ||
110 | #endif | ||
111 | #endif | ||
112 | |||
113 | #ifndef IRQF_SHARED | ||
114 | #define IRQF_SHARED SA_SHIRQ | ||
115 | #endif | ||
116 | |||
117 | #ifndef ARRAY_SIZE | ||
118 | #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) | ||
119 | #endif | ||
120 | |||
121 | #endif /* < 2.6.18 */ | ||
122 | |||
123 | |||
124 | /*****************************************************************************/ | ||
125 | #if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19)) | ||
126 | |||
127 | #if (!(defined(RHEL_MAJOR) && (RHEL_MAJOR == 5))) | ||
128 | #if (!(defined(RHEL_VERSION) && (RHEL_VERSION == 4) && (RHEL_UPDATE >= 5))) | ||
129 | typedef irqreturn_t (*irq_handler_t)(int, void*, struct pt_regs *); | ||
130 | #endif | ||
131 | #endif | ||
132 | |||
133 | typedef irqreturn_t (*new_handler_t)(int, void*); | ||
134 | static inline irqreturn_t _kc_request_irq(unsigned int irq, | ||
135 | new_handler_t handler, | ||
136 | unsigned long flags, | ||
137 | const char *devname, | ||
138 | void *dev_id) | ||
139 | { | ||
140 | irq_handler_t new_handler = (irq_handler_t) handler; | ||
141 | return request_irq(irq, new_handler, flags, devname, dev_id); | ||
142 | } | ||
143 | |||
144 | #undef request_irq | ||
145 | #define request_irq(irq, handler, flags, devname, dev_id) _kc_request_irq((irq), (handler), (flags), (devname), (dev_id)) | ||
146 | |||
147 | #endif | ||
148 | |||
149 | |||
150 | #endif | ||