diff options
Diffstat (limited to 'drivers/scsi/mpt2sas/mpt2sas_transport.c')
-rw-r--r-- | drivers/scsi/mpt2sas/mpt2sas_transport.c | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/drivers/scsi/mpt2sas/mpt2sas_transport.c b/drivers/scsi/mpt2sas/mpt2sas_transport.c index e03dc0b1e1a0..e4d858617c8d 100644 --- a/drivers/scsi/mpt2sas/mpt2sas_transport.c +++ b/drivers/scsi/mpt2sas/mpt2sas_transport.c | |||
@@ -264,7 +264,7 @@ struct rep_manu_reply{ | |||
264 | }; | 264 | }; |
265 | 265 | ||
266 | /** | 266 | /** |
267 | * transport_expander_report_manufacture - obtain SMP report_manufacture | 267 | * _transport_expander_report_manufacture - obtain SMP report_manufacture |
268 | * @ioc: per adapter object | 268 | * @ioc: per adapter object |
269 | * @sas_address: expander sas address | 269 | * @sas_address: expander sas address |
270 | * @edev: the sas_expander_device object | 270 | * @edev: the sas_expander_device object |
@@ -274,7 +274,7 @@ struct rep_manu_reply{ | |||
274 | * Returns 0 for success, non-zero for failure. | 274 | * Returns 0 for success, non-zero for failure. |
275 | */ | 275 | */ |
276 | static int | 276 | static int |
277 | transport_expander_report_manufacture(struct MPT2SAS_ADAPTER *ioc, | 277 | _transport_expander_report_manufacture(struct MPT2SAS_ADAPTER *ioc, |
278 | u64 sas_address, struct sas_expander_device *edev) | 278 | u64 sas_address, struct sas_expander_device *edev) |
279 | { | 279 | { |
280 | Mpi2SmpPassthroughRequest_t *mpi_request; | 280 | Mpi2SmpPassthroughRequest_t *mpi_request; |
@@ -578,7 +578,7 @@ mpt2sas_transport_port_add(struct MPT2SAS_ADAPTER *ioc, u16 handle, | |||
578 | MPI2_SAS_DEVICE_INFO_EDGE_EXPANDER || | 578 | MPI2_SAS_DEVICE_INFO_EDGE_EXPANDER || |
579 | mpt2sas_port->remote_identify.device_type == | 579 | mpt2sas_port->remote_identify.device_type == |
580 | MPI2_SAS_DEVICE_INFO_FANOUT_EXPANDER) | 580 | MPI2_SAS_DEVICE_INFO_FANOUT_EXPANDER) |
581 | transport_expander_report_manufacture(ioc, | 581 | _transport_expander_report_manufacture(ioc, |
582 | mpt2sas_port->remote_identify.sas_address, | 582 | mpt2sas_port->remote_identify.sas_address, |
583 | rphy_to_expander_device(rphy)); | 583 | rphy_to_expander_device(rphy)); |
584 | 584 | ||
@@ -852,7 +852,7 @@ rphy_to_ioc(struct sas_rphy *rphy) | |||
852 | } | 852 | } |
853 | 853 | ||
854 | /** | 854 | /** |
855 | * transport_get_linkerrors - | 855 | * _transport_get_linkerrors - |
856 | * @phy: The sas phy object | 856 | * @phy: The sas phy object |
857 | * | 857 | * |
858 | * Only support sas_host direct attached phys. | 858 | * Only support sas_host direct attached phys. |
@@ -860,7 +860,7 @@ rphy_to_ioc(struct sas_rphy *rphy) | |||
860 | * | 860 | * |
861 | */ | 861 | */ |
862 | static int | 862 | static int |
863 | transport_get_linkerrors(struct sas_phy *phy) | 863 | _transport_get_linkerrors(struct sas_phy *phy) |
864 | { | 864 | { |
865 | struct MPT2SAS_ADAPTER *ioc = phy_to_ioc(phy); | 865 | struct MPT2SAS_ADAPTER *ioc = phy_to_ioc(phy); |
866 | struct _sas_phy *mpt2sas_phy; | 866 | struct _sas_phy *mpt2sas_phy; |
@@ -903,14 +903,14 @@ transport_get_linkerrors(struct sas_phy *phy) | |||
903 | } | 903 | } |
904 | 904 | ||
905 | /** | 905 | /** |
906 | * transport_get_enclosure_identifier - | 906 | * _transport_get_enclosure_identifier - |
907 | * @phy: The sas phy object | 907 | * @phy: The sas phy object |
908 | * | 908 | * |
909 | * Obtain the enclosure logical id for an expander. | 909 | * Obtain the enclosure logical id for an expander. |
910 | * Returns 0 for success, non-zero for failure. | 910 | * Returns 0 for success, non-zero for failure. |
911 | */ | 911 | */ |
912 | static int | 912 | static int |
913 | transport_get_enclosure_identifier(struct sas_rphy *rphy, u64 *identifier) | 913 | _transport_get_enclosure_identifier(struct sas_rphy *rphy, u64 *identifier) |
914 | { | 914 | { |
915 | struct MPT2SAS_ADAPTER *ioc = rphy_to_ioc(rphy); | 915 | struct MPT2SAS_ADAPTER *ioc = rphy_to_ioc(rphy); |
916 | struct _sas_node *sas_expander; | 916 | struct _sas_node *sas_expander; |
@@ -929,13 +929,13 @@ transport_get_enclosure_identifier(struct sas_rphy *rphy, u64 *identifier) | |||
929 | } | 929 | } |
930 | 930 | ||
931 | /** | 931 | /** |
932 | * transport_get_bay_identifier - | 932 | * _transport_get_bay_identifier - |
933 | * @phy: The sas phy object | 933 | * @phy: The sas phy object |
934 | * | 934 | * |
935 | * Returns the slot id for a device that resides inside an enclosure. | 935 | * Returns the slot id for a device that resides inside an enclosure. |
936 | */ | 936 | */ |
937 | static int | 937 | static int |
938 | transport_get_bay_identifier(struct sas_rphy *rphy) | 938 | _transport_get_bay_identifier(struct sas_rphy *rphy) |
939 | { | 939 | { |
940 | struct MPT2SAS_ADAPTER *ioc = rphy_to_ioc(rphy); | 940 | struct MPT2SAS_ADAPTER *ioc = rphy_to_ioc(rphy); |
941 | struct _sas_device *sas_device; | 941 | struct _sas_device *sas_device; |
@@ -953,7 +953,7 @@ transport_get_bay_identifier(struct sas_rphy *rphy) | |||
953 | } | 953 | } |
954 | 954 | ||
955 | /** | 955 | /** |
956 | * transport_phy_reset - | 956 | * _transport_phy_reset - |
957 | * @phy: The sas phy object | 957 | * @phy: The sas phy object |
958 | * @hard_reset: | 958 | * @hard_reset: |
959 | * | 959 | * |
@@ -961,7 +961,7 @@ transport_get_bay_identifier(struct sas_rphy *rphy) | |||
961 | * Returns 0 for success, non-zero for failure. | 961 | * Returns 0 for success, non-zero for failure. |
962 | */ | 962 | */ |
963 | static int | 963 | static int |
964 | transport_phy_reset(struct sas_phy *phy, int hard_reset) | 964 | _transport_phy_reset(struct sas_phy *phy, int hard_reset) |
965 | { | 965 | { |
966 | struct MPT2SAS_ADAPTER *ioc = phy_to_ioc(phy); | 966 | struct MPT2SAS_ADAPTER *ioc = phy_to_ioc(phy); |
967 | struct _sas_phy *mpt2sas_phy; | 967 | struct _sas_phy *mpt2sas_phy; |
@@ -1002,7 +1002,7 @@ transport_phy_reset(struct sas_phy *phy, int hard_reset) | |||
1002 | } | 1002 | } |
1003 | 1003 | ||
1004 | /** | 1004 | /** |
1005 | * transport_smp_handler - transport portal for smp passthru | 1005 | * _transport_smp_handler - transport portal for smp passthru |
1006 | * @shost: shost object | 1006 | * @shost: shost object |
1007 | * @rphy: sas transport rphy object | 1007 | * @rphy: sas transport rphy object |
1008 | * @req: | 1008 | * @req: |
@@ -1012,7 +1012,7 @@ transport_phy_reset(struct sas_phy *phy, int hard_reset) | |||
1012 | * smp_rep_general /sys/class/bsg/expander-5:0 | 1012 | * smp_rep_general /sys/class/bsg/expander-5:0 |
1013 | */ | 1013 | */ |
1014 | static int | 1014 | static int |
1015 | transport_smp_handler(struct Scsi_Host *shost, struct sas_rphy *rphy, | 1015 | _transport_smp_handler(struct Scsi_Host *shost, struct sas_rphy *rphy, |
1016 | struct request *req) | 1016 | struct request *req) |
1017 | { | 1017 | { |
1018 | struct MPT2SAS_ADAPTER *ioc = shost_priv(shost); | 1018 | struct MPT2SAS_ADAPTER *ioc = shost_priv(shost); |
@@ -1201,11 +1201,11 @@ transport_smp_handler(struct Scsi_Host *shost, struct sas_rphy *rphy, | |||
1201 | } | 1201 | } |
1202 | 1202 | ||
1203 | struct sas_function_template mpt2sas_transport_functions = { | 1203 | struct sas_function_template mpt2sas_transport_functions = { |
1204 | .get_linkerrors = transport_get_linkerrors, | 1204 | .get_linkerrors = _transport_get_linkerrors, |
1205 | .get_enclosure_identifier = transport_get_enclosure_identifier, | 1205 | .get_enclosure_identifier = _transport_get_enclosure_identifier, |
1206 | .get_bay_identifier = transport_get_bay_identifier, | 1206 | .get_bay_identifier = _transport_get_bay_identifier, |
1207 | .phy_reset = transport_phy_reset, | 1207 | .phy_reset = _transport_phy_reset, |
1208 | .smp_handler = transport_smp_handler, | 1208 | .smp_handler = _transport_smp_handler, |
1209 | }; | 1209 | }; |
1210 | 1210 | ||
1211 | struct scsi_transport_template *mpt2sas_transport_template; | 1211 | struct scsi_transport_template *mpt2sas_transport_template; |