Merge tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...

[karo-tx-linux.git] / drivers / scsi / scsi_transport_srp.c

diff --git a/drivers/scsi/scsi_transport_srp.c b/drivers/scsi/scsi_transport_srp.c
index a0c5bfdc5366f3d2b9e76805d77b7db72f9b8399..ae45bd99baed72662b1c528aef97f3b49e9aeb6a 100644 (file)
--- a/drivers/scsi/scsi_transport_srp.c
+++ b/drivers/scsi/scsi_transport_srp.c
@@ -33,7 +33,6 @@
 #include <scsi/scsi_transport.h>
 #include <scsi/scsi_transport_srp.h>
 #include "scsi_priv.h"
-#include "scsi_transport_srp_internal.h"
 
 struct srp_host_attrs {
        atomic_t next_port_id;
@@ -747,18 +746,6 @@ struct srp_rport *srp_rport_add(struct Scsi_Host *shost,
                return ERR_PTR(ret);
        }
 
-       if (shost->active_mode & MODE_TARGET &&
-           ids->roles == SRP_RPORT_ROLE_INITIATOR) {
-               ret = srp_tgt_it_nexus_create(shost, (unsigned long)rport,
-                                             rport->port_id);
-               if (ret) {
-                       device_del(&rport->dev);
-                       transport_destroy_device(&rport->dev);
-                       put_device(&rport->dev);
-                       return ERR_PTR(ret);
-               }
-       }
-
        transport_add_device(&rport->dev);
        transport_configure_device(&rport->dev);
 
@@ -775,11 +762,6 @@ EXPORT_SYMBOL_GPL(srp_rport_add);
 void srp_rport_del(struct srp_rport *rport)
 {
        struct device *dev = &rport->dev;
-       struct Scsi_Host *shost = dev_to_shost(dev->parent);
-
-       if (shost->active_mode & MODE_TARGET &&
-           rport->roles == SRP_RPORT_ROLE_INITIATOR)
-               srp_tgt_it_nexus_destroy(shost, (unsigned long)rport);
 
        transport_remove_device(dev);
        device_del(dev);