diff options
author | Dan Williams <dan.j.williams@intel.com> | 2011-05-08 18:49:15 -0400 |
---|---|---|
committer | Dan Williams <dan.j.williams@intel.com> | 2011-07-03 07:04:47 -0400 |
commit | ce2b3261b6765c3b80fda95426c73e8d3bb1b035 (patch) | |
tree | 98d2007abbe37e70ec29e01cd4752fc04442085f /drivers/scsi/isci/phy.h | |
parent | 67ea838d17acdad3331aeae848683c768df96aaa (diff) |
isci: unify constants
cross driver constants are spread out over multiple header files, consolidate
them into isci.h, and push some includes out to the source files that need
them.
TODO: remove SCI_MODE_SIZE infrastructure.
TODO: task.h is full of inlines that are too large
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Diffstat (limited to 'drivers/scsi/isci/phy.h')
-rw-r--r-- | drivers/scsi/isci/phy.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/scsi/isci/phy.h b/drivers/scsi/isci/phy.h index 93ec2d4a9c30..3a95adbb508c 100644 --- a/drivers/scsi/isci/phy.h +++ b/drivers/scsi/isci/phy.h | |||
@@ -52,16 +52,12 @@ | |||
52 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 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. | 53 | * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
54 | */ | 54 | */ |
55 | |||
56 | |||
57 | #ifndef _ISCI_PHY_H_ | 55 | #ifndef _ISCI_PHY_H_ |
58 | #define _ISCI_PHY_H_ | 56 | #define _ISCI_PHY_H_ |
59 | 57 | ||
60 | #include <scsi/sas.h> | 58 | #include <scsi/sas.h> |
61 | #include <scsi/libsas.h> | 59 | #include <scsi/libsas.h> |
62 | #include "scic_sds_phy.h" | 60 | #include "scic_sds_phy.h" |
63 | #include "port.h" | ||
64 | #include "host.h" | ||
65 | 61 | ||
66 | struct isci_phy { | 62 | struct isci_phy { |
67 | struct scic_sds_phy sci; | 63 | struct scic_sds_phy sci; |
@@ -89,6 +85,7 @@ static inline struct isci_phy *sci_phy_to_iphy(struct scic_sds_phy *sci_phy) | |||
89 | return iphy; | 85 | return iphy; |
90 | } | 86 | } |
91 | 87 | ||
88 | struct isci_host; | ||
92 | void isci_phy_init(struct isci_phy *iphy, struct isci_host *ihost, int index); | 89 | void isci_phy_init(struct isci_phy *iphy, struct isci_host *ihost, int index); |
93 | int isci_phy_control(struct asd_sas_phy *phy, enum phy_func func, void *buf); | 90 | int isci_phy_control(struct asd_sas_phy *phy, enum phy_func func, void *buf); |
94 | 91 | ||