diff options
author | Edmund Nadolski <edmund.nadolski@intel.com> | 2011-02-08 11:31:55 -0500 |
---|---|---|
committer | Dan Williams <dan.j.williams@intel.com> | 2011-07-03 03:36:31 -0400 |
commit | b5739b60507af0607fe99f1582b2dce4aa70e0b8 (patch) | |
tree | 1288bd5d1106d53c9e321db95ac5243b59d8896a | |
parent | 82d29928c1c1c6a6605895f8240a9943394244d7 (diff) |
isci: kill sci_types.h
Signed-off-by: Edmund Nadolski <edmund.nadolski@intel.com>
[rebased after killing SCI_IO_REQUEST_DATA_DIRECTION]
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
30 files changed, 19 insertions, 98 deletions
diff --git a/drivers/scsi/isci/core/sci_base_memory_descriptor_list.h b/drivers/scsi/isci/core/sci_base_memory_descriptor_list.h index 614e0a98c61..b58d4e86e7b 100644 --- a/drivers/scsi/isci/core/sci_base_memory_descriptor_list.h +++ b/drivers/scsi/isci/core/sci_base_memory_descriptor_list.h | |||
@@ -64,7 +64,6 @@ | |||
64 | */ | 64 | */ |
65 | 65 | ||
66 | 66 | ||
67 | #include "sci_types.h" | ||
68 | #include "sci_memory_descriptor_list.h" | 67 | #include "sci_memory_descriptor_list.h" |
69 | 68 | ||
70 | 69 | ||
diff --git a/drivers/scsi/isci/core/sci_base_state_machine.h b/drivers/scsi/isci/core/sci_base_state_machine.h index cee38bd3d12..13f6ee80e15 100644 --- a/drivers/scsi/isci/core/sci_base_state_machine.h +++ b/drivers/scsi/isci/core/sci_base_state_machine.h | |||
@@ -56,6 +56,8 @@ | |||
56 | #ifndef _SCI_BASE_STATE_MACHINE_H_ | 56 | #ifndef _SCI_BASE_STATE_MACHINE_H_ |
57 | #define _SCI_BASE_STATE_MACHINE_H_ | 57 | #define _SCI_BASE_STATE_MACHINE_H_ |
58 | 58 | ||
59 | #include <linux/string.h> | ||
60 | |||
59 | /** | 61 | /** |
60 | * This file contains all structures, constants, or method declarations common | 62 | * This file contains all structures, constants, or method declarations common |
61 | * to all state machines defined in SCI. | 63 | * to all state machines defined in SCI. |
diff --git a/drivers/scsi/isci/core/sci_controller.h b/drivers/scsi/isci/core/sci_controller.h index 26c3548cbf7..5c7774e75dd 100644 --- a/drivers/scsi/isci/core/sci_controller.h +++ b/drivers/scsi/isci/core/sci_controller.h | |||
@@ -64,8 +64,6 @@ | |||
64 | */ | 64 | */ |
65 | 65 | ||
66 | 66 | ||
67 | #include "sci_types.h" | ||
68 | |||
69 | struct sci_base_memory_descriptor_list; | 67 | struct sci_base_memory_descriptor_list; |
70 | struct scic_sds_controller; | 68 | struct scic_sds_controller; |
71 | 69 | ||
diff --git a/drivers/scsi/isci/core/sci_memory_descriptor_list.h b/drivers/scsi/isci/core/sci_memory_descriptor_list.h index 44de1c18d2c..a039998d01c 100644 --- a/drivers/scsi/isci/core/sci_memory_descriptor_list.h +++ b/drivers/scsi/isci/core/sci_memory_descriptor_list.h | |||
@@ -64,7 +64,6 @@ | |||
64 | */ | 64 | */ |
65 | 65 | ||
66 | 66 | ||
67 | #include "sci_types.h" | ||
68 | 67 | ||
69 | struct sci_base_memory_descriptor_list; | 68 | struct sci_base_memory_descriptor_list; |
70 | 69 | ||
diff --git a/drivers/scsi/isci/core/sci_object.h b/drivers/scsi/isci/core/sci_object.h index 930694264f1..801b01bc896 100644 --- a/drivers/scsi/isci/core/sci_object.h +++ b/drivers/scsi/isci/core/sci_object.h | |||
@@ -65,7 +65,6 @@ | |||
65 | */ | 65 | */ |
66 | 66 | ||
67 | 67 | ||
68 | #include "sci_types.h" | ||
69 | #include "sci_status.h" | 68 | #include "sci_status.h" |
70 | 69 | ||
71 | /** | 70 | /** |
diff --git a/drivers/scsi/isci/core/sci_types.h b/drivers/scsi/isci/core/sci_types.h deleted file mode 100644 index fda3680546e..00000000000 --- a/drivers/scsi/isci/core/sci_types.h +++ /dev/null | |||
@@ -1,70 +0,0 @@ | |||
1 | /* | ||
2 | * This file is provided under a dual BSD/GPLv2 license. When using or | ||
3 | * redistributing this file, you may do so under either license. | ||
4 | * | ||
5 | * GPL LICENSE SUMMARY | ||
6 | * | ||
7 | * Copyright(c) 2008 - 2011 Intel Corporation. All rights reserved. | ||
8 | * | ||
9 | * This program is free software; you can redistribute it and/or modify | ||
10 | * it under the terms of version 2 of the GNU General Public License as | ||
11 | * published by the Free Software Foundation. | ||
12 | * | ||
13 | * This program is distributed in the hope that it will be useful, but | ||
14 | * WITHOUT ANY WARRANTY; without even the implied warranty of | ||
15 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
16 | * General Public License for more details. | ||
17 | * | ||
18 | * You should have received a copy of the GNU General Public License | ||
19 | * along with this program; if not, write to the Free Software | ||
20 | * Foundation, Inc., 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA. | ||
21 | * The full GNU General Public License is included in this distribution | ||
22 | * in the file called LICENSE.GPL. | ||
23 | * | ||
24 | * BSD LICENSE | ||
25 | * | ||
26 | * Copyright(c) 2008 - 2011 Intel Corporation. All rights reserved. | ||
27 | * All rights reserved. | ||
28 | * | ||
29 | * Redistribution and use in source and binary forms, with or without | ||
30 | * modification, are permitted provided that the following conditions | ||
31 | * are met: | ||
32 | * | ||
33 | * * Redistributions of source code must retain the above copyright | ||
34 | * notice, this list of conditions and the following disclaimer. | ||
35 | * * Redistributions in binary form must reproduce the above copyright | ||
36 | * notice, this list of conditions and the following disclaimer in | ||
37 | * the documentation and/or other materials provided with the | ||
38 | * distribution. | ||
39 | * * Neither the name of Intel Corporation nor the names of its | ||
40 | * contributors may be used to endorse or promote products derived | ||
41 | * from this software without specific prior written permission. | ||
42 | * | ||
43 | * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS | ||
44 | * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT | ||
45 | * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR | ||
46 | * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT | ||
47 | * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | ||
48 | * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT | ||
49 | * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | ||
50 | * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | ||
51 | * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
52 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | ||
53 | * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
54 | */ | ||
55 | |||
56 | #ifndef _SCI_TYPES_H_ | ||
57 | #define _SCI_TYPES_H_ | ||
58 | |||
59 | #include <linux/string.h> | ||
60 | |||
61 | #define sci_cb_make_physical_address(physical_addr, addr_upper, addr_lower) \ | ||
62 | ((physical_addr) = (addr_lower) | ((u64)addr_upper) << 32) | ||
63 | |||
64 | enum sci_controller_mode { | ||
65 | SCI_MODE_SPEED, /* Optimized for performance */ | ||
66 | SCI_MODE_SIZE /* Optimized for memory use */ | ||
67 | }; | ||
68 | |||
69 | #endif /* _SCI_TYPES_H_ */ | ||
70 | |||
diff --git a/drivers/scsi/isci/core/sci_util.h b/drivers/scsi/isci/core/sci_util.h index 67e2badf8ea..8f2ba35d955 100644 --- a/drivers/scsi/isci/core/sci_util.h +++ b/drivers/scsi/isci/core/sci_util.h | |||
@@ -56,7 +56,7 @@ | |||
56 | #ifndef _SCI_UTIL_H_ | 56 | #ifndef _SCI_UTIL_H_ |
57 | #define _SCI_UTIL_H_ | 57 | #define _SCI_UTIL_H_ |
58 | 58 | ||
59 | #include "sci_types.h" | 59 | #include <linux/string.h> |
60 | 60 | ||
61 | /** | 61 | /** |
62 | * SCIC_SWAP_DWORD() - | 62 | * SCIC_SWAP_DWORD() - |
@@ -81,6 +81,11 @@ | |||
81 | 81 | ||
82 | #define SCI_FIELD_OFFSET(type, field) ((unsigned long)&(((type *)0)->field)) | 82 | #define SCI_FIELD_OFFSET(type, field) ((unsigned long)&(((type *)0)->field)) |
83 | 83 | ||
84 | |||
85 | #define sci_cb_make_physical_address(physical_addr, addr_upper, addr_lower) \ | ||
86 | ((physical_addr) = (addr_lower) | ((u64)addr_upper) << 32) | ||
87 | |||
88 | |||
84 | /** | 89 | /** |
85 | * sci_physical_address_add() - | 90 | * sci_physical_address_add() - |
86 | * | 91 | * |
diff --git a/drivers/scsi/isci/core/scic_config_parameters.h b/drivers/scsi/isci/core/scic_config_parameters.h index 4c16a50a065..8bd85605130 100644 --- a/drivers/scsi/isci/core/scic_config_parameters.h +++ b/drivers/scsi/isci/core/scic_config_parameters.h | |||
@@ -65,7 +65,6 @@ | |||
65 | */ | 65 | */ |
66 | 66 | ||
67 | 67 | ||
68 | #include "sci_types.h" | ||
69 | #include "sci_status.h" | 68 | #include "sci_status.h" |
70 | #include "intel_sas.h" | 69 | #include "intel_sas.h" |
71 | #include "sci_controller_constants.h" | 70 | #include "sci_controller_constants.h" |
diff --git a/drivers/scsi/isci/core/scic_controller.h b/drivers/scsi/isci/core/scic_controller.h index 756b14fcd9a..1d459d6af21 100644 --- a/drivers/scsi/isci/core/scic_controller.h +++ b/drivers/scsi/isci/core/scic_controller.h | |||
@@ -64,7 +64,6 @@ | |||
64 | */ | 64 | */ |
65 | 65 | ||
66 | 66 | ||
67 | #include "sci_types.h" | ||
68 | #include "sci_status.h" | 67 | #include "sci_status.h" |
69 | #include "sci_controller.h" | 68 | #include "sci_controller.h" |
70 | #include "scic_config_parameters.h" | 69 | #include "scic_config_parameters.h" |
@@ -74,6 +73,13 @@ struct scic_sds_phy; | |||
74 | struct scic_sds_port; | 73 | struct scic_sds_port; |
75 | struct scic_sds_remote_device; | 74 | struct scic_sds_remote_device; |
76 | 75 | ||
76 | |||
77 | enum sci_controller_mode { | ||
78 | SCI_MODE_SPEED, /* Optimized for performance */ | ||
79 | SCI_MODE_SIZE /* Optimized for memory use */ | ||
80 | }; | ||
81 | |||
82 | |||
77 | /** | 83 | /** |
78 | * enum _SCIC_INTERRUPT_TYPE - This enumeration depicts the various types of | 84 | * enum _SCIC_INTERRUPT_TYPE - This enumeration depicts the various types of |
79 | * interrupts that are potentially supported by a SCI Core implementation. | 85 | * interrupts that are potentially supported by a SCI Core implementation. |
diff --git a/drivers/scsi/isci/core/scic_io_request.h b/drivers/scsi/isci/core/scic_io_request.h index 7378f335066..a52f33d94ab 100644 --- a/drivers/scsi/isci/core/scic_io_request.h +++ b/drivers/scsi/isci/core/scic_io_request.h | |||
@@ -64,7 +64,6 @@ | |||
64 | */ | 64 | */ |
65 | 65 | ||
66 | 66 | ||
67 | #include "sci_types.h" | ||
68 | #include "sci_status.h" | 67 | #include "sci_status.h" |
69 | #include "intel_sas.h" | 68 | #include "intel_sas.h" |
70 | 69 | ||
diff --git a/drivers/scsi/isci/core/scic_phy.h b/drivers/scsi/isci/core/scic_phy.h index fec273b123d..13f8a304fde 100644 --- a/drivers/scsi/isci/core/scic_phy.h +++ b/drivers/scsi/isci/core/scic_phy.h | |||
@@ -64,7 +64,6 @@ | |||
64 | */ | 64 | */ |
65 | 65 | ||
66 | 66 | ||
67 | #include "sci_types.h" | ||
68 | #include "sci_status.h" | 67 | #include "sci_status.h" |
69 | 68 | ||
70 | #include "intel_sata.h" | 69 | #include "intel_sata.h" |
diff --git a/drivers/scsi/isci/core/scic_port.h b/drivers/scsi/isci/core/scic_port.h index 34d22c04aa5..e55abb68ff9 100644 --- a/drivers/scsi/isci/core/scic_port.h +++ b/drivers/scsi/isci/core/scic_port.h | |||
@@ -64,7 +64,6 @@ | |||
64 | */ | 64 | */ |
65 | 65 | ||
66 | 66 | ||
67 | #include "sci_types.h" | ||
68 | #include "sci_status.h" | 67 | #include "sci_status.h" |
69 | #include "intel_sas.h" | 68 | #include "intel_sas.h" |
70 | 69 | ||
diff --git a/drivers/scsi/isci/core/scic_remote_device.h b/drivers/scsi/isci/core/scic_remote_device.h index e8c04592763..1401844349e 100644 --- a/drivers/scsi/isci/core/scic_remote_device.h +++ b/drivers/scsi/isci/core/scic_remote_device.h | |||
@@ -64,7 +64,6 @@ | |||
64 | */ | 64 | */ |
65 | 65 | ||
66 | 66 | ||
67 | #include "sci_types.h" | ||
68 | #include "sci_status.h" | 67 | #include "sci_status.h" |
69 | #include "intel_sas.h" | 68 | #include "intel_sas.h" |
70 | 69 | ||
diff --git a/drivers/scsi/isci/core/scic_sds_controller.h b/drivers/scsi/isci/core/scic_sds_controller.h index afa45f9874a..cce0da6a6a3 100644 --- a/drivers/scsi/isci/core/scic_sds_controller.h +++ b/drivers/scsi/isci/core/scic_sds_controller.h | |||
@@ -56,6 +56,8 @@ | |||
56 | #ifndef _SCIC_SDS_CONTROLLER_H_ | 56 | #ifndef _SCIC_SDS_CONTROLLER_H_ |
57 | #define _SCIC_SDS_CONTROLLER_H_ | 57 | #define _SCIC_SDS_CONTROLLER_H_ |
58 | 58 | ||
59 | #include <linux/string.h> | ||
60 | |||
59 | /** | 61 | /** |
60 | * This file contains the structures, constants and prototypes used for the | 62 | * This file contains the structures, constants and prototypes used for the |
61 | * core controller object. | 63 | * core controller object. |
diff --git a/drivers/scsi/isci/core/scic_sds_pci.h b/drivers/scsi/isci/core/scic_sds_pci.h index 21326777acc..bf0cbcaac52 100644 --- a/drivers/scsi/isci/core/scic_sds_pci.h +++ b/drivers/scsi/isci/core/scic_sds_pci.h | |||
@@ -64,7 +64,6 @@ | |||
64 | */ | 64 | */ |
65 | 65 | ||
66 | #include <asm/io.h> | 66 | #include <asm/io.h> |
67 | #include "sci_types.h" | ||
68 | 67 | ||
69 | struct scic_sds_controller; | 68 | struct scic_sds_controller; |
70 | 69 | ||
diff --git a/drivers/scsi/isci/core/scic_sds_remote_node_context.h b/drivers/scsi/isci/core/scic_sds_remote_node_context.h index 59eacf8f400..9e759a3619f 100644 --- a/drivers/scsi/isci/core/scic_sds_remote_node_context.h +++ b/drivers/scsi/isci/core/scic_sds_remote_node_context.h | |||
@@ -64,7 +64,6 @@ | |||
64 | * | 64 | * |
65 | */ | 65 | */ |
66 | 66 | ||
67 | #include "sci_types.h" | ||
68 | #include "sci_base_state.h" | 67 | #include "sci_base_state.h" |
69 | #include "sci_base_state_machine.h" | 68 | #include "sci_base_state_machine.h" |
70 | 69 | ||
diff --git a/drivers/scsi/isci/core/scic_sds_remote_node_table.h b/drivers/scsi/isci/core/scic_sds_remote_node_table.h index 6ee5fbab25d..9c02a6ccb2f 100644 --- a/drivers/scsi/isci/core/scic_sds_remote_node_table.h +++ b/drivers/scsi/isci/core/scic_sds_remote_node_table.h | |||
@@ -63,7 +63,6 @@ | |||
63 | * | 63 | * |
64 | */ | 64 | */ |
65 | 65 | ||
66 | #include "sci_types.h" | ||
67 | #include "sci_controller_constants.h" | 66 | #include "sci_controller_constants.h" |
68 | 67 | ||
69 | /** | 68 | /** |
diff --git a/drivers/scsi/isci/core/scic_sds_request.c b/drivers/scsi/isci/core/scic_sds_request.c index 7c5b61bdee6..2bd47f49e53 100644 --- a/drivers/scsi/isci/core/scic_sds_request.c +++ b/drivers/scsi/isci/core/scic_sds_request.c | |||
@@ -72,7 +72,6 @@ | |||
72 | #include "scic_sds_unsolicited_frame_control.h" | 72 | #include "scic_sds_unsolicited_frame_control.h" |
73 | #include "scic_user_callback.h" | 73 | #include "scic_user_callback.h" |
74 | #include "sci_environment.h" | 74 | #include "sci_environment.h" |
75 | #include "sci_types.h" | ||
76 | #include "sci_util.h" | 75 | #include "sci_util.h" |
77 | #include "scu_completion_codes.h" | 76 | #include "scu_completion_codes.h" |
78 | #include "scu_constants.h" | 77 | #include "scu_constants.h" |
diff --git a/drivers/scsi/isci/core/scic_sds_smp_request.h b/drivers/scsi/isci/core/scic_sds_smp_request.h index b7c5b83b198..bcad282ce75 100644 --- a/drivers/scsi/isci/core/scic_sds_smp_request.h +++ b/drivers/scsi/isci/core/scic_sds_smp_request.h | |||
@@ -56,7 +56,6 @@ | |||
56 | #define _SCIC_SDS_SMP_REQUEST_T_ | 56 | #define _SCIC_SDS_SMP_REQUEST_T_ |
57 | 57 | ||
58 | #include "intel_sas.h" | 58 | #include "intel_sas.h" |
59 | #include "sci_types.h" | ||
60 | #include "scic_sds_request.h" | 59 | #include "scic_sds_request.h" |
61 | 60 | ||
62 | 61 | ||
diff --git a/drivers/scsi/isci/core/scic_sds_stp_packet_request.h b/drivers/scsi/isci/core/scic_sds_stp_packet_request.h index fc18b3f6a13..2a7aec922de 100644 --- a/drivers/scsi/isci/core/scic_sds_stp_packet_request.h +++ b/drivers/scsi/isci/core/scic_sds_stp_packet_request.h | |||
@@ -56,7 +56,6 @@ | |||
56 | #define _SCIC_SDS_STP_PACKET_REQUEST_H_ | 56 | #define _SCIC_SDS_STP_PACKET_REQUEST_H_ |
57 | 57 | ||
58 | #include "intel_sas.h" | 58 | #include "intel_sas.h" |
59 | #include "sci_types.h" | ||
60 | #include "scic_sds_stp_request.h" | 59 | #include "scic_sds_stp_request.h" |
61 | 60 | ||
62 | /** | 61 | /** |
diff --git a/drivers/scsi/isci/core/scic_sds_stp_request.c b/drivers/scsi/isci/core/scic_sds_stp_request.c index 49c494c097c..0b6b0552186 100644 --- a/drivers/scsi/isci/core/scic_sds_stp_request.c +++ b/drivers/scsi/isci/core/scic_sds_stp_request.c | |||
@@ -69,7 +69,6 @@ | |||
69 | #include "scic_sds_unsolicited_frame_control.h" | 69 | #include "scic_sds_unsolicited_frame_control.h" |
70 | #include "scic_user_callback.h" | 70 | #include "scic_user_callback.h" |
71 | #include "sci_environment.h" | 71 | #include "sci_environment.h" |
72 | #include "sci_types.h" | ||
73 | #include "sci_util.h" | 72 | #include "sci_util.h" |
74 | #include "scu_completion_codes.h" | 73 | #include "scu_completion_codes.h" |
75 | #include "scu_event_codes.h" | 74 | #include "scu_event_codes.h" |
diff --git a/drivers/scsi/isci/core/scic_sds_stp_request.h b/drivers/scsi/isci/core/scic_sds_stp_request.h index 0a12ff6417c..4a4c68aa56d 100644 --- a/drivers/scsi/isci/core/scic_sds_stp_request.h +++ b/drivers/scsi/isci/core/scic_sds_stp_request.h | |||
@@ -58,7 +58,6 @@ | |||
58 | 58 | ||
59 | #include <linux/dma-mapping.h> | 59 | #include <linux/dma-mapping.h> |
60 | #include "intel_sata.h" | 60 | #include "intel_sata.h" |
61 | #include "sci_types.h" | ||
62 | #include "scic_sds_request.h" | 61 | #include "scic_sds_request.h" |
63 | 62 | ||
64 | /** | 63 | /** |
diff --git a/drivers/scsi/isci/core/scic_task_request.h b/drivers/scsi/isci/core/scic_task_request.h index ef76cb6bdbe..7e6d20aa0f0 100644 --- a/drivers/scsi/isci/core/scic_task_request.h +++ b/drivers/scsi/isci/core/scic_task_request.h | |||
@@ -65,7 +65,6 @@ | |||
65 | */ | 65 | */ |
66 | 66 | ||
67 | 67 | ||
68 | #include "sci_types.h" | ||
69 | #include "sci_status.h" | 68 | #include "sci_status.h" |
70 | 69 | ||
71 | struct scic_sds_request; | 70 | struct scic_sds_request; |
diff --git a/drivers/scsi/isci/core/scic_user_callback.h b/drivers/scsi/isci/core/scic_user_callback.h index 4df7106f61a..ec4eb278cd5 100644 --- a/drivers/scsi/isci/core/scic_user_callback.h +++ b/drivers/scsi/isci/core/scic_user_callback.h | |||
@@ -64,8 +64,8 @@ | |||
64 | */ | 64 | */ |
65 | 65 | ||
66 | 66 | ||
67 | #include "sci_types.h" | ||
68 | #include "sci_status.h" | 67 | #include "sci_status.h" |
68 | #include "scic_io_request.h" | ||
69 | 69 | ||
70 | struct scic_sds_request; | 70 | struct scic_sds_request; |
71 | struct scic_sds_phy; | 71 | struct scic_sds_phy; |
diff --git a/drivers/scsi/isci/core/scu_registers.h b/drivers/scsi/isci/core/scu_registers.h index 175d2b98bdf..de2ce93b783 100644 --- a/drivers/scsi/isci/core/scu_registers.h +++ b/drivers/scsi/isci/core/scu_registers.h | |||
@@ -63,7 +63,6 @@ | |||
63 | * | 63 | * |
64 | */ | 64 | */ |
65 | 65 | ||
66 | #include "sci_types.h" | ||
67 | #include "scu_viit_data.h" | 66 | #include "scu_viit_data.h" |
68 | 67 | ||
69 | 68 | ||
diff --git a/drivers/scsi/isci/core/scu_remote_node_context.h b/drivers/scsi/isci/core/scu_remote_node_context.h index 8006f2ee2d1..33745adc826 100644 --- a/drivers/scsi/isci/core/scu_remote_node_context.h +++ b/drivers/scsi/isci/core/scu_remote_node_context.h | |||
@@ -62,7 +62,6 @@ | |||
62 | * | 62 | * |
63 | * | 63 | * |
64 | */ | 64 | */ |
65 | #include "sci_types.h" | ||
66 | 65 | ||
67 | /** | 66 | /** |
68 | * struct ssp_remote_node_context - This structure contains the SCU hardware | 67 | * struct ssp_remote_node_context - This structure contains the SCU hardware |
diff --git a/drivers/scsi/isci/core/scu_task_context.h b/drivers/scsi/isci/core/scu_task_context.h index d08c51bb226..818a575298d 100644 --- a/drivers/scsi/isci/core/scu_task_context.h +++ b/drivers/scsi/isci/core/scu_task_context.h | |||
@@ -63,7 +63,6 @@ | |||
63 | * | 63 | * |
64 | */ | 64 | */ |
65 | 65 | ||
66 | #include "sci_types.h" | ||
67 | 66 | ||
68 | /** | 67 | /** |
69 | * enum SCU_SSP_TASK_TYPE - This enumberation defines the various SSP task | 68 | * enum SCU_SSP_TASK_TYPE - This enumberation defines the various SSP task |
diff --git a/drivers/scsi/isci/core/scu_unsolicited_frame.h b/drivers/scsi/isci/core/scu_unsolicited_frame.h index 590ea02745f..187c4f03f59 100644 --- a/drivers/scsi/isci/core/scu_unsolicited_frame.h +++ b/drivers/scsi/isci/core/scu_unsolicited_frame.h | |||
@@ -64,7 +64,7 @@ | |||
64 | #ifndef _SCU_UNSOLICITED_FRAME_H_ | 64 | #ifndef _SCU_UNSOLICITED_FRAME_H_ |
65 | #define _SCU_UNSOLICITED_FRAME_H_ | 65 | #define _SCU_UNSOLICITED_FRAME_H_ |
66 | 66 | ||
67 | #include "sci_types.h" | 67 | #include <linux/string.h> |
68 | 68 | ||
69 | /** | 69 | /** |
70 | * | 70 | * |
diff --git a/drivers/scsi/isci/core/scu_viit_data.h b/drivers/scsi/isci/core/scu_viit_data.h index 4601d1962ca..c959d915822 100644 --- a/drivers/scsi/isci/core/scu_viit_data.h +++ b/drivers/scsi/isci/core/scu_viit_data.h | |||
@@ -63,7 +63,6 @@ | |||
63 | * | 63 | * |
64 | */ | 64 | */ |
65 | 65 | ||
66 | #include "sci_types.h" | ||
67 | 66 | ||
68 | #define SCU_VIIT_ENTRY_ID_MASK (0xC0000000) | 67 | #define SCU_VIIT_ENTRY_ID_MASK (0xC0000000) |
69 | #define SCU_VIIT_ENTRY_ID_SHIFT (30) | 68 | #define SCU_VIIT_ENTRY_ID_SHIFT (30) |
diff --git a/drivers/scsi/isci/isci.h b/drivers/scsi/isci/isci.h index 7d984f408f2..21371e73e29 100644 --- a/drivers/scsi/isci/isci.h +++ b/drivers/scsi/isci/isci.h | |||
@@ -79,7 +79,6 @@ | |||
79 | #include <scsi/libsas.h> | 79 | #include <scsi/libsas.h> |
80 | #include <scsi/scsi.h> | 80 | #include <scsi/scsi.h> |
81 | 81 | ||
82 | #include "sci_types.h" | ||
83 | #include "sci_base_controller.h" | 82 | #include "sci_base_controller.h" |
84 | #include "scic_controller.h" | 83 | #include "scic_controller.h" |
85 | #include "host.h" | 84 | #include "host.h" |