diff options
| author | James Bottomley <James.Bottomley@HansenPartnership.com> | 2016-08-19 07:41:12 -0700 |
|---|---|---|
| committer | James Bottomley <James.Bottomley@HansenPartnership.com> | 2016-08-19 07:41:12 -0700 |
| commit | 14a5916e0cce6dbc9acedc99576261c6568689d2 (patch) | |
| tree | 205750c95e7a0f8641c480a2e0a5d31dc4ece606 /include | |
| parent | 01b3add8d665428109e901dae2f8df04d255aab1 (diff) | |
| parent | a0f81dbeef13aa0aeaa8b955b38735dbf09de392 (diff) | |
Merge remote-tracking branch 'mkp-scsi/4.8/scsi-fixes' into fixes
Diffstat (limited to 'include')
| -rw-r--r-- | include/scsi/scsi_transport_sas.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/include/scsi/scsi_transport_sas.h b/include/scsi/scsi_transport_sas.h index 13c0b2ba1b6c..73d870918939 100644 --- a/include/scsi/scsi_transport_sas.h +++ b/include/scsi/scsi_transport_sas.h @@ -11,12 +11,12 @@ struct sas_rphy; struct request; #if !IS_ENABLED(CONFIG_SCSI_SAS_ATTRS) -static inline int is_sas_attached(struct scsi_device *sdev) +static inline int scsi_is_sas_rphy(const struct device *sdev) { return 0; } #else -extern int is_sas_attached(struct scsi_device *sdev); +extern int scsi_is_sas_rphy(const struct device *); #endif static inline int sas_protocol_ata(enum sas_protocol proto) @@ -202,7 +202,6 @@ extern int sas_rphy_add(struct sas_rphy *); extern void sas_rphy_remove(struct sas_rphy *); extern void sas_rphy_delete(struct sas_rphy *); extern void sas_rphy_unlink(struct sas_rphy *); -extern int scsi_is_sas_rphy(const struct device *); struct sas_port *sas_port_alloc(struct device *, int); struct sas_port *sas_port_alloc_num(struct device *); |