diff options
author | Maciej Patelczyk <maciej.patelczyk@intel.com> | 2011-04-28 18:06:36 -0400 |
---|---|---|
committer | Dan Williams <dan.j.williams@intel.com> | 2011-07-03 07:00:39 -0400 |
commit | be2f41c611b65353fa3ae0c155cf906b348dc864 (patch) | |
tree | d424c46e91d28b59e6824b15aca0ec8cfd38fee5 /drivers | |
parent | 890cae9b8a7defd87feb1ec77a2affd25bd59cce (diff) |
isci: Removed sci_object.h from project.
The sci_object.h file was removed. No sci_base_object
is now in the code.
Reported-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Maciej Patelczyk <maciej.patelczyk@intel.com>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/scsi/isci/core/sci_base_state.h | 2 | ||||
-rw-r--r-- | drivers/scsi/isci/core/sci_object.h | 98 | ||||
-rw-r--r-- | drivers/scsi/isci/core/scic_io_request.h | 9 | ||||
-rw-r--r-- | drivers/scsi/isci/core/scic_sds_smp_request.c | 3 | ||||
-rw-r--r-- | drivers/scsi/isci/isci.h | 1 |
5 files changed, 4 insertions, 109 deletions
diff --git a/drivers/scsi/isci/core/sci_base_state.h b/drivers/scsi/isci/core/sci_base_state.h index 62d2a7c30f07..d64efac1f090 100644 --- a/drivers/scsi/isci/core/sci_base_state.h +++ b/drivers/scsi/isci/core/sci_base_state.h | |||
@@ -56,8 +56,6 @@ | |||
56 | #ifndef _SCI_BASE_STATE_H_ | 56 | #ifndef _SCI_BASE_STATE_H_ |
57 | #define _SCI_BASE_STATE_H_ | 57 | #define _SCI_BASE_STATE_H_ |
58 | 58 | ||
59 | #include "sci_object.h" | ||
60 | |||
61 | typedef void (*sci_base_state_handler_t)(void); | 59 | typedef void (*sci_base_state_handler_t)(void); |
62 | 60 | ||
63 | typedef void (*sci_state_transition_t)(void *base_object); | 61 | typedef void (*sci_state_transition_t)(void *base_object); |
diff --git a/drivers/scsi/isci/core/sci_object.h b/drivers/scsi/isci/core/sci_object.h deleted file mode 100644 index 801b01bc8964..000000000000 --- a/drivers/scsi/isci/core/sci_object.h +++ /dev/null | |||
@@ -1,98 +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_OBJECT_H_ | ||
57 | #define _SCI_OBJECT_H_ | ||
58 | |||
59 | /** | ||
60 | * This file contains all of the method and constants associated with the SCI | ||
61 | * base object. The SCI base object is the class from which all other | ||
62 | * objects derive in the Storage Controller Interface. | ||
63 | * | ||
64 | * | ||
65 | */ | ||
66 | |||
67 | |||
68 | #include "sci_status.h" | ||
69 | |||
70 | /** | ||
71 | * struct sci_base_object - all core objects must include this as their | ||
72 | * first member to permit the casting below | ||
73 | * | ||
74 | * TODO: unwind this assumption, convert these routines and callers to pass a struct | ||
75 | * sci_base_object pointer without casting, or convert 'private' to the | ||
76 | * expected type per-object | ||
77 | * | ||
78 | */ | ||
79 | struct sci_base_object { | ||
80 | void *private; | ||
81 | }; | ||
82 | |||
83 | static inline void *sci_object_get_association(void *obj) | ||
84 | { | ||
85 | struct sci_base_object *base = obj; | ||
86 | |||
87 | return base->private; | ||
88 | } | ||
89 | |||
90 | static inline void sci_object_set_association(void *obj, void *private) | ||
91 | { | ||
92 | struct sci_base_object *base = obj; | ||
93 | |||
94 | base->private = private; | ||
95 | } | ||
96 | |||
97 | #endif /* _SCI_OBJECT_H_ */ | ||
98 | |||
diff --git a/drivers/scsi/isci/core/scic_io_request.h b/drivers/scsi/isci/core/scic_io_request.h index 1ac530d2d3bd..16022636fed0 100644 --- a/drivers/scsi/isci/core/scic_io_request.h +++ b/drivers/scsi/isci/core/scic_io_request.h | |||
@@ -161,8 +161,7 @@ enum sci_status scic_io_request_construct( | |||
161 | * if the remote_device does not support the SSP protocol. | 161 | * if the remote_device does not support the SSP protocol. |
162 | * SCI_FAILURE_INVALID_ASSOCIATION This value is returned if the user did not | 162 | * SCI_FAILURE_INVALID_ASSOCIATION This value is returned if the user did not |
163 | * properly set the association between the SCIC IO request and the user's IO | 163 | * properly set the association between the SCIC IO request and the user's IO |
164 | * request. Please refer to the sci_object_set_association() routine for more | 164 | * request. |
165 | * information. | ||
166 | */ | 165 | */ |
167 | enum sci_status scic_io_request_construct_basic_ssp( | 166 | enum sci_status scic_io_request_construct_basic_ssp( |
168 | struct scic_sds_request *scic_io_request); | 167 | struct scic_sds_request *scic_io_request); |
@@ -184,8 +183,7 @@ enum sci_status scic_io_request_construct_basic_ssp( | |||
184 | * if the remote_device does not support the STP protocol. | 183 | * if the remote_device does not support the STP protocol. |
185 | * SCI_FAILURE_INVALID_ASSOCIATION This value is returned if the user did not | 184 | * SCI_FAILURE_INVALID_ASSOCIATION This value is returned if the user did not |
186 | * properly set the association between the SCIC IO request and the user's IO | 185 | * properly set the association between the SCIC IO request and the user's IO |
187 | * request. Please refer to the sci_object_set_association() routine for more | 186 | * request. |
188 | * information. | ||
189 | */ | 187 | */ |
190 | enum sci_status scic_io_request_construct_basic_sata( | 188 | enum sci_status scic_io_request_construct_basic_sata( |
191 | struct scic_sds_request *scic_io_request); | 189 | struct scic_sds_request *scic_io_request); |
@@ -206,8 +204,7 @@ enum sci_status scic_io_request_construct_basic_sata( | |||
206 | * if the remote_device does not support the SMP protocol. | 204 | * if the remote_device does not support the SMP protocol. |
207 | * SCI_FAILURE_INVALID_ASSOCIATION This value is returned if the user did not | 205 | * SCI_FAILURE_INVALID_ASSOCIATION This value is returned if the user did not |
208 | * properly set the association between the SCIC IO request and the user's IO | 206 | * properly set the association between the SCIC IO request and the user's IO |
209 | * request. Please refer to the sci_object_set_association() routine for more | 207 | * request. |
210 | * information. | ||
211 | */ | 208 | */ |
212 | enum sci_status scic_io_request_construct_smp( | 209 | enum sci_status scic_io_request_construct_smp( |
213 | struct scic_sds_request *scic_io_request); | 210 | struct scic_sds_request *scic_io_request); |
diff --git a/drivers/scsi/isci/core/scic_sds_smp_request.c b/drivers/scsi/isci/core/scic_sds_smp_request.c index ba29192f7fd0..fff86687c8bf 100644 --- a/drivers/scsi/isci/core/scic_sds_smp_request.c +++ b/drivers/scsi/isci/core/scic_sds_smp_request.c | |||
@@ -574,8 +574,7 @@ static const struct sci_base_state scic_sds_smp_request_started_substate_table[] | |||
574 | * if the remote_device does not support the SMP protocol. | 574 | * if the remote_device does not support the SMP protocol. |
575 | * SCI_FAILURE_INVALID_ASSOCIATION This value is returned if the user did not | 575 | * SCI_FAILURE_INVALID_ASSOCIATION This value is returned if the user did not |
576 | * properly set the association between the SCIC IO request and the user's IO | 576 | * properly set the association between the SCIC IO request and the user's IO |
577 | * request. Please refer to the sci_object_set_association() routine for more | 577 | * request. |
578 | * information. | ||
579 | */ | 578 | */ |
580 | enum sci_status scic_io_request_construct_smp(struct scic_sds_request *sci_req) | 579 | enum sci_status scic_io_request_construct_smp(struct scic_sds_request *sci_req) |
581 | { | 580 | { |
diff --git a/drivers/scsi/isci/isci.h b/drivers/scsi/isci/isci.h index ac292d2a75de..60c84627c13e 100644 --- a/drivers/scsi/isci/isci.h +++ b/drivers/scsi/isci/isci.h | |||
@@ -65,7 +65,6 @@ | |||
65 | #include <scsi/libsas.h> | 65 | #include <scsi/libsas.h> |
66 | #include <scsi/scsi.h> | 66 | #include <scsi/scsi.h> |
67 | 67 | ||
68 | #include "core/sci_object.h" | ||
69 | #include "scic_controller.h" | 68 | #include "scic_controller.h" |
70 | #include "host.h" | 69 | #include "host.h" |
71 | #include "timers.h" | 70 | #include "timers.h" |