Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 254313
b: refs/heads/master
c: b5739b6
h: refs/heads/master
i:
  254311: 0081cef
v: v3
  • Loading branch information
Edmund Nadolski authored and Dan Williams committed Jul 3, 2011
1 parent 47f213d commit bf63e65
Show file tree
Hide file tree
Showing 31 changed files with 20 additions and 99 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 82d29928c1c1c6a6605895f8240a9943394244d7
refs/heads/master: b5739b60507af0607fe99f1582b2dce4aa70e0b8
1 change: 0 additions & 1 deletion trunk/drivers/scsi/isci/core/sci_base_memory_descriptor_list.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@
*/


#include "sci_types.h"
#include "sci_memory_descriptor_list.h"


Expand Down
2 changes: 2 additions & 0 deletions trunk/drivers/scsi/isci/core/sci_base_state_machine.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 0 additions & 2 deletions trunk/drivers/scsi/isci/core/sci_controller.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,6 @@
*/


#include "sci_types.h"

struct sci_base_memory_descriptor_list;
struct scic_sds_controller;

Expand Down
1 change: 0 additions & 1 deletion trunk/drivers/scsi/isci/core/sci_memory_descriptor_list.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@
*/


#include "sci_types.h"

struct sci_base_memory_descriptor_list;

Expand Down
1 change: 0 additions & 1 deletion trunk/drivers/scsi/isci/core/sci_object.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@
*/


#include "sci_types.h"
#include "sci_status.h"

/**
Expand Down
70 changes: 0 additions & 70 deletions trunk/drivers/scsi/isci/core/sci_types.h
View file

This file was deleted.

7 changes: 6 additions & 1 deletion trunk/drivers/scsi/isci/core/sci_util.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
#ifndef _SCI_UTIL_H_
#define _SCI_UTIL_H_

#include "sci_types.h"
#include <linux/string.h>

/**
* SCIC_SWAP_DWORD() -
Expand All @@ -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() -
*
Expand Down
1 change: 0 additions & 1 deletion trunk/drivers/scsi/isci/core/scic_config_parameters.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@
*/


#include "sci_types.h"
#include "sci_status.h"
#include "intel_sas.h"
#include "sci_controller_constants.h"
Expand Down
8 changes: 7 additions & 1 deletion trunk/drivers/scsi/isci/core/scic_controller.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@
*/


#include "sci_types.h"
#include "sci_status.h"
#include "sci_controller.h"
#include "scic_config_parameters.h"
Expand All @@ -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.
Expand Down
1 change: 0 additions & 1 deletion trunk/drivers/scsi/isci/core/scic_io_request.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@
*/


#include "sci_types.h"
#include "sci_status.h"
#include "intel_sas.h"

Expand Down
1 change: 0 additions & 1 deletion trunk/drivers/scsi/isci/core/scic_phy.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@
*/


#include "sci_types.h"
#include "sci_status.h"

#include "intel_sata.h"
Expand Down
1 change: 0 additions & 1 deletion trunk/drivers/scsi/isci/core/scic_port.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@
*/


#include "sci_types.h"
#include "sci_status.h"
#include "intel_sas.h"

Expand Down
1 change: 0 additions & 1 deletion trunk/drivers/scsi/isci/core/scic_remote_device.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@
*/


#include "sci_types.h"
#include "sci_status.h"
#include "intel_sas.h"

Expand Down
2 changes: 2 additions & 0 deletions trunk/drivers/scsi/isci/core/scic_sds_controller.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
1 change: 0 additions & 1 deletion trunk/drivers/scsi/isci/core/scic_sds_pci.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@
*/

#include <asm/io.h>
#include "sci_types.h"

struct scic_sds_controller;

Expand Down
1 change: 0 additions & 1 deletion trunk/drivers/scsi/isci/core/scic_sds_remote_node_context.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@
*
*/

#include "sci_types.h"
#include "sci_base_state.h"
#include "sci_base_state_machine.h"

Expand Down
1 change: 0 additions & 1 deletion trunk/drivers/scsi/isci/core/scic_sds_remote_node_table.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@
*
*/

#include "sci_types.h"
#include "sci_controller_constants.h"

/**
Expand Down
1 change: 0 additions & 1 deletion trunk/drivers/scsi/isci/core/scic_sds_request.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion trunk/drivers/scsi/isci/core/scic_sds_smp_request.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@
#define _SCIC_SDS_SMP_REQUEST_T_

#include "intel_sas.h"
#include "sci_types.h"
#include "scic_sds_request.h"


Expand Down
1 change: 0 additions & 1 deletion trunk/drivers/scsi/isci/core/scic_sds_stp_packet_request.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"

/**
Expand Down
1 change: 0 additions & 1 deletion trunk/drivers/scsi/isci/core/scic_sds_stp_request.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion trunk/drivers/scsi/isci/core/scic_sds_stp_request.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@

#include <linux/dma-mapping.h>
#include "intel_sata.h"
#include "sci_types.h"
#include "scic_sds_request.h"

/**
Expand Down
1 change: 0 additions & 1 deletion trunk/drivers/scsi/isci/core/scic_task_request.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@
*/


#include "sci_types.h"
#include "sci_status.h"

struct scic_sds_request;
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/scsi/isci/core/scic_user_callback.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
1 change: 0 additions & 1 deletion trunk/drivers/scsi/isci/core/scu_registers.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@
*
*/

#include "sci_types.h"
#include "scu_viit_data.h"


Expand Down
1 change: 0 additions & 1 deletion trunk/drivers/scsi/isci/core/scu_remote_node_context.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@
*
*
*/
#include "sci_types.h"

/**
* struct ssp_remote_node_context - This structure contains the SCU hardware
Expand Down
1 change: 0 additions & 1 deletion trunk/drivers/scsi/isci/core/scu_task_context.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@
*
*/

#include "sci_types.h"

/**
* enum SCU_SSP_TASK_TYPE - This enumberation defines the various SSP task
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/scsi/isci/core/scu_unsolicited_frame.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
#ifndef _SCU_UNSOLICITED_FRAME_H_
#define _SCU_UNSOLICITED_FRAME_H_

#include "sci_types.h"
#include <linux/string.h>

/**
*
Expand Down
1 change: 0 additions & 1 deletion trunk/drivers/scsi/isci/core/scu_viit_data.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@
*
*/

#include "sci_types.h"

#define SCU_VIIT_ENTRY_ID_MASK (0xC0000000)
#define SCU_VIIT_ENTRY_ID_SHIFT (30)
Expand Down
1 change: 0 additions & 1 deletion trunk/drivers/scsi/isci/isci.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit bf63e65

Please sign in to comment.