isci: kill sci_types.h
authorEdmund Nadolski <edmund.nadolski@intel.com>
Tue, 8 Feb 2011 16:31:55 +0000 (09:31 -0700)
committerDan Williams <dan.j.williams@intel.com>
Sun, 3 Jul 2011 07:36:31 +0000 (00:36 -0700)
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:
drivers/scsi/isci/core/sci_base_memory_descriptor_list.h
drivers/scsi/isci/core/sci_base_state_machine.h
drivers/scsi/isci/core/sci_controller.h
drivers/scsi/isci/core/sci_memory_descriptor_list.h
drivers/scsi/isci/core/sci_object.h
drivers/scsi/isci/core/sci_types.h [deleted file]
drivers/scsi/isci/core/sci_util.h
drivers/scsi/isci/core/scic_config_parameters.h
drivers/scsi/isci/core/scic_controller.h
drivers/scsi/isci/core/scic_io_request.h
drivers/scsi/isci/core/scic_phy.h
drivers/scsi/isci/core/scic_port.h
drivers/scsi/isci/core/scic_remote_device.h
drivers/scsi/isci/core/scic_sds_controller.h
drivers/scsi/isci/core/scic_sds_pci.h
drivers/scsi/isci/core/scic_sds_remote_node_context.h
drivers/scsi/isci/core/scic_sds_remote_node_table.h
drivers/scsi/isci/core/scic_sds_request.c
drivers/scsi/isci/core/scic_sds_smp_request.h
drivers/scsi/isci/core/scic_sds_stp_packet_request.h
drivers/scsi/isci/core/scic_sds_stp_request.c
drivers/scsi/isci/core/scic_sds_stp_request.h
drivers/scsi/isci/core/scic_task_request.h
drivers/scsi/isci/core/scic_user_callback.h
drivers/scsi/isci/core/scu_registers.h
drivers/scsi/isci/core/scu_remote_node_context.h
drivers/scsi/isci/core/scu_task_context.h
drivers/scsi/isci/core/scu_unsolicited_frame.h
drivers/scsi/isci/core/scu_viit_data.h
drivers/scsi/isci/isci.h

index 614e0a98c614b60ceb7be62da29803389b5a5b24..b58d4e86e7b906ace957831bd610b0efbd0713d2 100644 (file)
@@ -64,7 +64,6 @@
  */
 
 
-#include "sci_types.h"
 #include "sci_memory_descriptor_list.h"
 
 
index cee38bd3d127a8eb385dc29d3d67dd53985d9e68..13f6ee80e15cb173e749017a4c18a138a1025a59 100644 (file)
@@ -56,6 +56,8 @@
 #ifndef _SCI_BASE_STATE_MACHINE_H_
 #define _SCI_BASE_STATE_MACHINE_H_
 
+#include <linux/string.h>
+
 /**
  * This file contains all structures, constants, or method declarations common
  *    to all state machines defined in SCI.
index 26c3548cbf7adec643f2981cc3d12e62d2b9186b..5c7774e75ddf1b4c69297965bdd759fa97c0d65d 100644 (file)
@@ -64,8 +64,6 @@
  */
 
 
-#include "sci_types.h"
-
 struct sci_base_memory_descriptor_list;
 struct scic_sds_controller;
 
index 44de1c18d2c842166ddc24238d2d7fa049a44d9f..a039998d01c63d69054a7956cfcba66a5ac7f092 100644 (file)
@@ -64,7 +64,6 @@
  */
 
 
-#include "sci_types.h"
 
 struct sci_base_memory_descriptor_list;
 
index 930694264f1a46bed1cd80d186d6b03433a87102..801b01bc8964740627df1045febd1da221f64cd5 100644 (file)
@@ -65,7 +65,6 @@
  */
 
 
-#include "sci_types.h"
 #include "sci_status.h"
 
 /**
diff --git a/drivers/scsi/isci/core/sci_types.h b/drivers/scsi/isci/core/sci_types.h
deleted file mode 100644 (file)
index fda3680..0000000
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * This file is provided under a dual BSD/GPLv2 license.  When using or
- * redistributing this file, you may do so under either license.
- *
- * GPL LICENSE SUMMARY
- *
- * Copyright(c) 2008 - 2011 Intel Corporation. All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
- * The full GNU General Public License is included in this distribution
- * in the file called LICENSE.GPL.
- *
- * BSD LICENSE
- *
- * Copyright(c) 2008 - 2011 Intel Corporation. All rights reserved.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *   * Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- *   * Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in
- *     the documentation and/or other materials provided with the
- *     distribution.
- *   * Neither the name of Intel Corporation nor the names of its
- *     contributors may be used to endorse or promote products derived
- *     from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef _SCI_TYPES_H_
-#define _SCI_TYPES_H_
-
-#include <linux/string.h>
-
-#define sci_cb_make_physical_address(physical_addr, addr_upper, addr_lower) \
-       ((physical_addr) = (addr_lower) | ((u64)addr_upper) << 32)
-
-enum sci_controller_mode {
-       SCI_MODE_SPEED,         /* Optimized for performance */
-       SCI_MODE_SIZE           /* Optimized for memory use */
-};
-
-#endif  /* _SCI_TYPES_H_ */
-
index 67e2badf8ea800ef12514b00a75e97c1531d6d71..8f2ba35d955fbc20eca1f49f842c0d7a85af2d58 100644 (file)
@@ -56,7 +56,7 @@
 #ifndef _SCI_UTIL_H_
 #define _SCI_UTIL_H_
 
-#include "sci_types.h"
+#include <linux/string.h>
 
 /**
  * SCIC_SWAP_DWORD() -
 
 #define SCI_FIELD_OFFSET(type, field)   ((unsigned long)&(((type *)0)->field))
 
+
+#define sci_cb_make_physical_address(physical_addr, addr_upper, addr_lower) \
+       ((physical_addr) = (addr_lower) | ((u64)addr_upper) << 32)
+
+
 /**
  * sci_physical_address_add() -
  *
index 4c16a50a06584dd9de761d345e331d5c44660164..8bd85605130cd3f720855476ce2b9e8fccf75f5d 100644 (file)
@@ -65,7 +65,6 @@
  */
 
 
-#include "sci_types.h"
 #include "sci_status.h"
 #include "intel_sas.h"
 #include "sci_controller_constants.h"
index 756b14fcd9a44560f3f28e00f29f6495c942aabf..1d459d6af21b5ba67e14a88b5e7064f036ea1dc5 100644 (file)
@@ -64,7 +64,6 @@
  */
 
 
-#include "sci_types.h"
 #include "sci_status.h"
 #include "sci_controller.h"
 #include "scic_config_parameters.h"
@@ -74,6 +73,13 @@ struct scic_sds_phy;
 struct scic_sds_port;
 struct scic_sds_remote_device;
 
+
+enum sci_controller_mode {
+       SCI_MODE_SPEED,         /* Optimized for performance */
+       SCI_MODE_SIZE           /* Optimized for memory use */
+};
+
+
 /**
  * enum _SCIC_INTERRUPT_TYPE - This enumeration depicts the various types of
  *    interrupts that are potentially supported by a SCI Core implementation.
index 7378f335066c447575a7379d5a4906ccde122e92..a52f33d94abd059ffa7a98eeeaffd67f1d410b20 100644 (file)
@@ -64,7 +64,6 @@
  */
 
 
-#include "sci_types.h"
 #include "sci_status.h"
 #include "intel_sas.h"
 
index fec273b123d4a1efb50a6810da61b466a92a4de8..13f8a304fdefb44016ee4c97a33c7dad8a0e2b12 100644 (file)
@@ -64,7 +64,6 @@
  */
 
 
-#include "sci_types.h"
 #include "sci_status.h"
 
 #include "intel_sata.h"
index 34d22c04aa567fcefdbf7a96c9d5446fe7312d52..e55abb68ff9af2497a441317a8c06c728ff5b040 100644 (file)
@@ -64,7 +64,6 @@
  */
 
 
-#include "sci_types.h"
 #include "sci_status.h"
 #include "intel_sas.h"
 
index e8c04592763e57eea2bfb1a1724d8b4b6683afe2..1401844349e6bb61d57cf205d1b0050150bd7085 100644 (file)
@@ -64,7 +64,6 @@
  */
 
 
-#include "sci_types.h"
 #include "sci_status.h"
 #include "intel_sas.h"
 
index afa45f9874a40765c854c16e359b12e71ed7d6f6..cce0da6a6a3dc51a27de1e4086d876b463f973c8 100644 (file)
@@ -56,6 +56,8 @@
 #ifndef _SCIC_SDS_CONTROLLER_H_
 #define _SCIC_SDS_CONTROLLER_H_
 
+#include <linux/string.h>
+
 /**
  * This file contains the structures, constants and prototypes used for the
  *    core controller object.
index 21326777acc6d0e63f50c6cab89cd677027f5bc3..bf0cbcaac526f75e819ad6ea2b774c18940d44bb 100644 (file)
@@ -64,7 +64,6 @@
  */
 
 #include <asm/io.h>
-#include "sci_types.h"
 
 struct scic_sds_controller;
 
index 59eacf8f400cbfcea71691196a65ef7906eeec9f..9e759a3619f1427af5c18b9578b6c0dd04de02bc 100644 (file)
@@ -64,7 +64,6 @@
  *
  */
 
-#include "sci_types.h"
 #include "sci_base_state.h"
 #include "sci_base_state_machine.h"
 
index 6ee5fbab25dd99f5f4d00499f79a9d4de92b6eaa..9c02a6ccb2fe40bad69db7c27b2d43d8375d5d2f 100644 (file)
@@ -63,7 +63,6 @@
  *
  */
 
-#include "sci_types.h"
 #include "sci_controller_constants.h"
 
 /**
index 7c5b61bdee67d720d30ec21c151d1bd1564294cb..2bd47f49e536fa4f80236310bd5c063c92ae1a5b 100644 (file)
@@ -72,7 +72,6 @@
 #include "scic_sds_unsolicited_frame_control.h"
 #include "scic_user_callback.h"
 #include "sci_environment.h"
-#include "sci_types.h"
 #include "sci_util.h"
 #include "scu_completion_codes.h"
 #include "scu_constants.h"
index b7c5b83b19897f297600dcef216ced0c0eb6107f..bcad282ce753b1cc359ebd7ddb361e50eb1dd515 100644 (file)
@@ -56,7 +56,6 @@
 #define _SCIC_SDS_SMP_REQUEST_T_
 
 #include "intel_sas.h"
-#include "sci_types.h"
 #include "scic_sds_request.h"
 
 
index fc18b3f6a13faf1cb8402b7cfad90e3299c9b63e..2a7aec922deefd525e5189f6799e871af661b506 100644 (file)
@@ -56,7 +56,6 @@
 #define _SCIC_SDS_STP_PACKET_REQUEST_H_
 
 #include "intel_sas.h"
-#include "sci_types.h"
 #include "scic_sds_stp_request.h"
 
 /**
index 49c494c097cb75505aff8577a204dce679da6fed..0b6b0552186ac22523a90cc773157bf00b7dce13 100644 (file)
@@ -69,7 +69,6 @@
 #include "scic_sds_unsolicited_frame_control.h"
 #include "scic_user_callback.h"
 #include "sci_environment.h"
-#include "sci_types.h"
 #include "sci_util.h"
 #include "scu_completion_codes.h"
 #include "scu_event_codes.h"
index 0a12ff6417cc242780c49c0b6368f75592bcad67..4a4c68aa56deacedebef4aa585e9b34620a330ec 100644 (file)
@@ -58,7 +58,6 @@
 
 #include <linux/dma-mapping.h>
 #include "intel_sata.h"
-#include "sci_types.h"
 #include "scic_sds_request.h"
 
 /**
index ef76cb6bdbeaf4d8fb2c1a654452335755a7a2fb..7e6d20aa0f0299c76e5666d8035599e2e08b4aef 100644 (file)
@@ -65,7 +65,6 @@
  */
 
 
-#include "sci_types.h"
 #include "sci_status.h"
 
 struct scic_sds_request;
index 4df7106f61aa1e75524085ec760dadb49480510d..ec4eb278cd5f0907ef1bfefd4db0e08c937202f9 100644 (file)
@@ -64,8 +64,8 @@
  */
 
 
-#include "sci_types.h"
 #include "sci_status.h"
+#include "scic_io_request.h"
 
 struct scic_sds_request;
 struct scic_sds_phy;
index 175d2b98bdf2f867a514217fe56a4712f7ad6896..de2ce93b78369bf4271453f076cd833548a47125 100644 (file)
@@ -63,7 +63,6 @@
  *
  */
 
-#include "sci_types.h"
 #include "scu_viit_data.h"
 
 
index 8006f2ee2d1d3122252fbb54e95e5f648e154bd5..33745adc826b56135790073ded8d54820305f988 100644 (file)
@@ -62,7 +62,6 @@
  *
  *
  */
-#include "sci_types.h"
 
 /**
  * struct ssp_remote_node_context - This structure contains the SCU hardware
index d08c51bb226212a3f68bb5f65ddfb81189d2a8f8..818a575298d3da4f29c71d5c003e5e270fe2444c 100644 (file)
@@ -63,7 +63,6 @@
  *
  */
 
-#include "sci_types.h"
 
 /**
  * enum SCU_SSP_TASK_TYPE - This enumberation defines the various SSP task
index 590ea02745fd9c8994ea684db170dba7283eb6fc..187c4f03f59632a7e755f25259e086439824c62b 100644 (file)
@@ -64,7 +64,7 @@
 #ifndef _SCU_UNSOLICITED_FRAME_H_
 #define _SCU_UNSOLICITED_FRAME_H_
 
-#include "sci_types.h"
+#include <linux/string.h>
 
 /**
  *
index 4601d1962ca3aa48c82c98060668c73df25786ae..c959d915822510b9a284fcef5cb105fce0239d35 100644 (file)
@@ -63,7 +63,6 @@
  *
  */
 
-#include "sci_types.h"
 
 #define SCU_VIIT_ENTRY_ID_MASK         (0xC0000000)
 #define SCU_VIIT_ENTRY_ID_SHIFT        (30)
index 7d984f408f24f90b176263724b6a682aa36364b7..21371e73e296473f4517628e714c19b786c469b0 100644 (file)
@@ -79,7 +79,6 @@
 #include <scsi/libsas.h>
 #include <scsi/scsi.h>
 
-#include "sci_types.h"
 #include "sci_base_controller.h"
 #include "scic_controller.h"
 #include "host.h"