Skip to content

Commit

Permalink
isci: move core/controller to host
Browse files Browse the repository at this point in the history
Now that the data structures are unified unify the implementation in
host.[ch] and cleanup namespace pollution.

Reported-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
  • Loading branch information
Dan Williams committed Jul 3, 2011
1 parent ce2b326 commit cc9203b
Show file tree
Hide file tree
Showing 28 changed files with 3,363 additions and 3,943 deletions.
1 change: 0 additions & 1 deletion drivers/scsi/isci/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ isci-objs := init.o phy.o request.o sata.o \
host.o task.o probe_roms.o \
remote_node_context.o \
remote_node_table.o \
core/scic_sds_controller.o \
core/scic_sds_request.o \
core/scic_sds_stp_request.o \
core/scic_sds_port.o \
Expand Down
1 change: 0 additions & 1 deletion drivers/scsi/isci/core/sci_util.c
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@

#include <linux/kernel.h>
#include "sci_util.h"
#include "sci_environment.h"
#include "request.h"

void *scic_request_get_virt_addr(struct scic_sds_request *sci_req, dma_addr_t phys_addr)
Expand Down
38 changes: 0 additions & 38 deletions drivers/scsi/isci/core/scic_config_parameters.h
Original file line number Diff line number Diff line change
Expand Up @@ -229,44 +229,6 @@ union scic_oem_parameters {
struct scic_sds_oem_params sds1;
};

/**
* scic_user_parameters_set() - This method allows the user to attempt to
* change the user parameters utilized by the controller.
* @controller: This parameter specifies the controller on which to set the
* user parameters.
* @user_parameters: This parameter specifies the USER_PARAMETERS object
* containing the potential new values.
*
* Indicate if the update of the user parameters was successful. SCI_SUCCESS
* This value is returned if the operation succeeded. SCI_FAILURE_INVALID_STATE
* This value is returned if the attempt to change the user parameter failed,
* because changing one of the parameters is not currently allowed.
* SCI_FAILURE_INVALID_PARAMETER_VALUE This value is returned if the user
* supplied an invalid interrupt coalescence time, spin up delay interval, etc.
*/
enum sci_status scic_user_parameters_set(
struct scic_sds_controller *controller,
union scic_user_parameters *user_parameters);

/**
* scic_oem_parameters_set() - This method allows the user to attempt to change
* the OEM parameters utilized by the controller.
* @controller: This parameter specifies the controller on which to set the
* user parameters.
* @oem_parameters: This parameter specifies the OEM parameters object
* containing the potential new values.
*
* Indicate if the update of the user parameters was successful. SCI_SUCCESS
* This value is returned if the operation succeeded. SCI_FAILURE_INVALID_STATE
* This value is returned if the attempt to change the user parameter failed,
* because changing one of the parameters is not currently allowed.
* SCI_FAILURE_INVALID_PARAMETER_VALUE This value is returned if the user
* supplied an unsupported value for one of the OEM parameters.
*/
enum sci_status scic_oem_parameters_set(
struct scic_sds_controller *controller,
union scic_oem_parameters *oem_parameters);

int scic_oem_parameters_validate(struct scic_sds_oem_params *oem);

/**
Expand Down
130 changes: 0 additions & 130 deletions drivers/scsi/isci/core/scic_controller.h

This file was deleted.

Loading

0 comments on commit cc9203b

Please sign in to comment.