redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

isci: kill sci_types.h

Browse source 
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>
This commit is contained in:
Edmund Nadolski 2011-02-08 09:31:55 -07:00 committed by Dan Williams
parent 82d29928c1
commit b5739b6050
30 changed files with 19 additions and 98 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
drivers/scsi/isci/core/sci_base_memory_descriptor_list.h
View file

@ -64,7 +64,6 @@
*/
#include "sci_types.h"
#include "sci_memory_descriptor_list.h"

2
drivers/scsi/isci/core/sci_base_state_machine.h
View 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.

2
drivers/scsi/isci/core/sci_controller.h
View file

@ -64,8 +64,6 @@
*/
#include "sci_types.h"
struct sci_base_memory_descriptor_list;
struct scic_sds_controller;

1
drivers/scsi/isci/core/sci_memory_descriptor_list.h
View file

@ -64,7 +64,6 @@
*/
#include "sci_types.h"
struct sci_base_memory_descriptor_list;

1
drivers/scsi/isci/core/sci_object.h
View file

@ -65,7 +65,6 @@
*/
#include "sci_types.h"
#include "sci_status.h"
/**

70
drivers/scsi/isci/core/sci_types.h
View file

@ -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_ */

7
drivers/scsi/isci/core/sci_util.h
View file

@ -56,7 +56,7 @@
#ifndef _SCI_UTIL_H_
#define _SCI_UTIL_H_
#include "sci_types.h"
#include <linux/string.h>
/**
* SCIC_SWAP_DWORD() -
@ -81,6 +81,11 @@
#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() -
*

1
drivers/scsi/isci/core/scic_config_parameters.h
View file

@ -65,7 +65,6 @@
*/
#include "sci_types.h"
#include "sci_status.h"
#include "intel_sas.h"
#include "sci_controller_constants.h"

8
drivers/scsi/isci/core/scic_controller.h
View 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.

1
drivers/scsi/isci/core/scic_io_request.h
View file

@ -64,7 +64,6 @@
*/
#include "sci_types.h"
#include "sci_status.h"
#include "intel_sas.h"

1
drivers/scsi/isci/core/scic_phy.h
View file

@ -64,7 +64,6 @@
*/
#include "sci_types.h"
#include "sci_status.h"
#include "intel_sata.h"

1
drivers/scsi/isci/core/scic_port.h
View file

@ -64,7 +64,6 @@
*/
#include "sci_types.h"
#include "sci_status.h"
#include "intel_sas.h"

1
drivers/scsi/isci/core/scic_remote_device.h
View file

@ -64,7 +64,6 @@
*/
#include "sci_types.h"
#include "sci_status.h"
#include "intel_sas.h"

2
drivers/scsi/isci/core/scic_sds_controller.h
View 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.

1
drivers/scsi/isci/core/scic_sds_pci.h
View file

@ -64,7 +64,6 @@
*/
#include <asm/io.h>
#include "sci_types.h"
struct scic_sds_controller;

1
drivers/scsi/isci/core/scic_sds_remote_node_context.h
View file

@ -64,7 +64,6 @@
*
*/
#include "sci_types.h"
#include "sci_base_state.h"
#include "sci_base_state_machine.h"

1
drivers/scsi/isci/core/scic_sds_remote_node_table.h
View file

@ -63,7 +63,6 @@
*
*/
#include "sci_types.h"
#include "sci_controller_constants.h"
/**

1
drivers/scsi/isci/core/scic_sds_request.c
View 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"

1
drivers/scsi/isci/core/scic_sds_smp_request.h
View file

@ -56,7 +56,6 @@
#define _SCIC_SDS_SMP_REQUEST_T_
#include "intel_sas.h"
#include "sci_types.h"
#include "scic_sds_request.h"

1
drivers/scsi/isci/core/scic_sds_stp_packet_request.h
View 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"
/**

1
drivers/scsi/isci/core/scic_sds_stp_request.c
View 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"

1
drivers/scsi/isci/core/scic_sds_stp_request.h
View file

@ -58,7 +58,6 @@
#include <linux/dma-mapping.h>
#include "intel_sata.h"
#include "sci_types.h"
#include "scic_sds_request.h"
/**

1
drivers/scsi/isci/core/scic_task_request.h
View file

@ -65,7 +65,6 @@
*/
#include "sci_types.h"
#include "sci_status.h"
struct scic_sds_request;

2
drivers/scsi/isci/core/scic_user_callback.h
View 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;

1
drivers/scsi/isci/core/scu_registers.h
View file

@ -63,7 +63,6 @@
*
*/
#include "sci_types.h"
#include "scu_viit_data.h"

1
drivers/scsi/isci/core/scu_remote_node_context.h
View file

@ -62,7 +62,6 @@
*
*
*/
#include "sci_types.h"
/**
* struct ssp_remote_node_context - This structure contains the SCU hardware

1
drivers/scsi/isci/core/scu_task_context.h
View file

@ -63,7 +63,6 @@
*
*/
#include "sci_types.h"
/**
* enum SCU_SSP_TASK_TYPE - This enumberation defines the various SSP task

2
drivers/scsi/isci/core/scu_unsolicited_frame.h
View file

@ -64,7 +64,7 @@
#ifndef _SCU_UNSOLICITED_FRAME_H_
#define _SCU_UNSOLICITED_FRAME_H_
#include "sci_types.h"
#include <linux/string.h>
/**
*

1
drivers/scsi/isci/core/scu_viit_data.h
View file

@ -63,7 +63,6 @@
*
*/
#include "sci_types.h"
#define SCU_VIIT_ENTRY_ID_MASK (0xC0000000)
#define SCU_VIIT_ENTRY_ID_SHIFT (30)

1
drivers/scsi/isci/isci.h
View 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"