3 files changed, 39 insertions, 7 deletions

diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
index 4562273dfad3..7877dfdd2322 100644
--- a/drivers/scsi/Kconfig
+++ b/drivers/scsi/Kconfig
@@ -291,11 +291,18 @@ source "drivers/scsi/libsas/Kconfig"
 
 config SCSI_SRP_ATTRS
         tristate "SRP Transport Attributes"
-        depends on SCSI && SCSI_TGT
+        depends on SCSI
         help
           If you wish to export transport-specific information about
           each attached SRP device to sysfs, say Y.
 
+config SCSI_SRP_TGT_ATTRS
+        bool "SCSI target support for SRP Transport Attributes"
+        depends on SCSI_SRP_ATTRS
+        depends on SCSI_TGT = y || SCSI_TGT = SCSI_SRP_ATTRS
+        help
+                If you want to use SCSI target mode drivers enable this option.
+
 endmenu
 
 menuconfig SCSI_LOWLEVEL
@@ -848,7 +855,7 @@ config SCSI_IBMVSCSI
 
 config SCSI_IBMVSCSIS
         tristate "IBM Virtual SCSI Server support"
-        depends on PPC_PSERIES && SCSI_TGT && SCSI_SRP && SCSI_SRP_ATTRS
+        depends on PPC_PSERIES && SCSI_SRP && SCSI_SRP_TGT_ATTRS
         help
           This is the SRP target driver for IBM pSeries virtual environments.
 
diff --git a/drivers/scsi/scsi_transport_srp.c b/drivers/scsi/scsi_transport_srp.c
index cdd001a6639c..430501ef9f02 100644
--- a/drivers/scsi/scsi_transport_srp.c
+++ b/drivers/scsi/scsi_transport_srp.c
@@ -30,7 +30,7 @@
 #include <scsi/scsi_host.h>
 #include <scsi/scsi_transport.h>
 #include <scsi/scsi_transport_srp.h>
-#include <scsi/scsi_tgt.h>
+#include "scsi_transport_srp_internal.h"
 
 struct srp_host_attrs {
         atomic_t next_port_id;
@@ -223,8 +223,8 @@ struct srp_rport *srp_rport_add(struct Scsi_Host *shost,
         }
 
         if (ids->roles == SRP_RPORT_ROLE_INITIATOR) {
-                ret = scsi_tgt_it_nexus_create(shost, (unsigned long)rport,
-                                               rport->port_id);
+                ret = srp_tgt_it_nexus_create(shost, (unsigned long)rport,
+                                              rport->port_id);
                 if (ret) {
                         device_del(&rport->dev);
                         transport_destroy_device(&rport->dev);
@@ -251,8 +251,8 @@ void srp_rport_del(struct srp_rport *rport)
         struct device *dev = &rport->dev;
 
         if (rport->roles == SRP_RPORT_ROLE_INITIATOR)
-                scsi_tgt_it_nexus_destroy(dev_to_shost(dev->parent),
-                                          (unsigned long)rport);
+                srp_tgt_it_nexus_destroy(dev_to_shost(dev->parent),
+                                         (unsigned long)rport);
 
         transport_remove_device(dev);
         device_del(dev);
diff --git a/drivers/scsi/scsi_transport_srp_internal.h b/drivers/scsi/scsi_transport_srp_internal.h
new file mode 100644
index 000000000000..8a79747f9f3d
--- /dev/null
+++ b/drivers/scsi/scsi_transport_srp_internal.h
@@ -0,0 +1,25 @@
+#include <scsi/scsi_tgt.h>
+
+#ifdef CONFIG_SCSI_SRP_TGT_ATTRS
+static inline int srp_tgt_it_nexus_create(struct Scsi_Host *shost, u64 itn_id,
+                                          char *initiator)
+{
+        return scsi_tgt_it_nexus_create(shost, itn_id, initiator);
+}
+
+static inline int srp_tgt_it_nexus_destroy(struct Scsi_Host *shost, u64 itn_id)
+{
+        return scsi_tgt_it_nexus_destroy(shost, itn_id);
+}
+
+#else
+static inline int srp_tgt_it_nexus_create(struct Scsi_Host *shost, u64 itn_id,
+                                          char *initiator)
+{
+        return 0;
+}
+static inline int srp_tgt_it_nexus_destroy(struct Scsi_Host *shost, u64 itn_id)
+{
+        return 0;
+}
+#endif