summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohannes Thumshirn <jthumshirn@suse.de>2016-08-17 11:46:16 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-10-07 15:21:26 +0200
commitc31d2667729ab5ba75e1e4da6a870e7d79ede04e (patch)
tree1a71778e98332e0cd801bb5d6a7ed188a6179753
parent1ee64247675e80f0438ecc819d4e42e1cb06f1d4 (diff)
downloadlinux-stable-c31d2667729ab5ba75e1e4da6a870e7d79ede04e.tar.gz
linux-stable-c31d2667729ab5ba75e1e4da6a870e7d79ede04e.tar.bz2
linux-stable-c31d2667729ab5ba75e1e4da6a870e7d79ede04e.zip
scsi: sas: provide stub implementation for scsi_is_sas_rphy
commit c1a23f6d64552b4480208aa584ec7e9c13d6d9c3 upstream. Provide a stub implementation for scsi_is_sas_rphy for kernel configurations which do not have CONFIG_SCSI_SAS_ATTRS defined. Reported-by: kbuild test robot <lkp@intel.com> Suggested-by: James Bottomley <jejb@linux.vnet.ibm.com> Reviewed-by: James E.J. Bottomley <jejb@linux.vnet.ibm.com> Signed-off-by: Johannes Thumshirn <jthumshirn@suse.de> Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--include/scsi/scsi_transport_sas.h7
1 files changed, 6 insertions, 1 deletions
diff --git a/include/scsi/scsi_transport_sas.h b/include/scsi/scsi_transport_sas.h
index 13c0b2ba1b6c..31ae074dad9d 100644
--- a/include/scsi/scsi_transport_sas.h
+++ b/include/scsi/scsi_transport_sas.h
@@ -15,8 +15,14 @@ static inline int is_sas_attached(struct scsi_device *sdev)
{
return 0;
}
+
+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 +208,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 *);