7 files changed, 43 insertions, 42 deletions

diff --git a/drivers/scsi/bnx2fc/bnx2fc_hwi.c b/drivers/scsi/bnx2fc/bnx2fc_hwi.c
index 6d6eee42ac7d..ef60afa94d0e 100644
--- a/drivers/scsi/bnx2fc/bnx2fc_hwi.c
+++ b/drivers/scsi/bnx2fc/bnx2fc_hwi.c
@@ -296,7 +296,7 @@ int bnx2fc_send_session_ofld_req(struct fcoe_port *port,
         ofld_req3.flags |= (interface->vlan_enabled <<
                             FCOE_KWQE_CONN_OFFLOAD3_B_VLAN_FLAG_SHIFT);
 
-        /* C2_VALID and ACK flags are not set as they are not suppported */
+        /* C2_VALID and ACK flags are not set as they are not supported */
 
 
         /* Initialize offload request 4 structure */
diff --git a/drivers/scsi/libsas/sas_expander.c b/drivers/scsi/libsas/sas_expander.c
index efc6e72f09f3..aec2e0da5016 100644
--- a/drivers/scsi/libsas/sas_expander.c
+++ b/drivers/scsi/libsas/sas_expander.c
@@ -1800,7 +1800,7 @@ out:
  * @dev:domain device to be detect.
  * @src_dev: the device which originated BROADCAST(CHANGE).
  *
- * Add self-configuration expander suport. Suppose two expander cascading,
+ * Add self-configuration expander support. Suppose two expander cascading,
  * when the first level expander is self-configuring, hotplug the disks in
  * second level expander, BROADCAST(CHANGE) will not only be originated
  * in the second level expander, but also be originated in the first level
diff --git a/drivers/scsi/megaraid/megaraid_sas.h b/drivers/scsi/megaraid/megaraid_sas.h
index 16b7a72a70c4..3b2365c8eab2 100644
--- a/drivers/scsi/megaraid/megaraid_sas.h
+++ b/drivers/scsi/megaraid/megaraid_sas.h
@@ -1276,7 +1276,7 @@ struct megasas_evt_detail {
 } __attribute__ ((packed));
 
 struct megasas_aen_event {
-        struct work_struct hotplug_work;
+        struct delayed_work hotplug_work;
         struct megasas_instance *instance;
 };
 
diff --git a/drivers/scsi/megaraid/megaraid_sas_base.c b/drivers/scsi/megaraid/megaraid_sas_base.c
index d2c5366aff7f..e4f2baacf1e1 100644
--- a/drivers/scsi/megaraid/megaraid_sas_base.c
+++ b/drivers/scsi/megaraid/megaraid_sas_base.c
@@ -2060,9 +2060,9 @@ megasas_service_aen(struct megasas_instance *instance, struct megasas_cmd *cmd)
                 } else {
                         ev->instance = instance;
                         instance->ev = ev;
-                        INIT_WORK(&ev->hotplug_work, megasas_aen_polling);
-                        schedule_delayed_work(
-                                (struct delayed_work *)&ev->hotplug_work, 0);
+                        INIT_DELAYED_WORK(&ev->hotplug_work,
+                                          megasas_aen_polling);
+                        schedule_delayed_work(&ev->hotplug_work, 0);
                 }
         }
 }
@@ -4352,8 +4352,7 @@ megasas_suspend(struct pci_dev *pdev, pm_message_t state)
         /* cancel the delayed work if this work still in queue */
         if (instance->ev != NULL) {
                 struct megasas_aen_event *ev = instance->ev;
-                cancel_delayed_work_sync(
-                        (struct delayed_work *)&ev->hotplug_work);
+                cancel_delayed_work_sync(&ev->hotplug_work);
                 instance->ev = NULL;
         }
 
@@ -4545,8 +4544,7 @@ static void __devexit megasas_detach_one(struct pci_dev *pdev)
         /* cancel the delayed work if this work still in queue*/
         if (instance->ev != NULL) {
                 struct megasas_aen_event *ev = instance->ev;
-                cancel_delayed_work_sync(
-                        (struct delayed_work *)&ev->hotplug_work);
+                cancel_delayed_work_sync(&ev->hotplug_work);
                 instance->ev = NULL;
         }
 
@@ -5190,7 +5188,7 @@ static void
 megasas_aen_polling(struct work_struct *work)
 {
         struct megasas_aen_event *ev =
-                container_of(work, struct megasas_aen_event, hotplug_work);
+                container_of(work, struct megasas_aen_event, hotplug_work.work);
         struct megasas_instance *instance = ev->instance;
         union megasas_evt_class_locale class_locale;
         struct  Scsi_Host *host;
diff --git a/drivers/scsi/qla2xxx/qla_target.c b/drivers/scsi/qla2xxx/qla_target.c
index dc98ec9b1b7a..ad1dc14bacce 100644
--- a/drivers/scsi/qla2xxx/qla_target.c
+++ b/drivers/scsi/qla2xxx/qla_target.c
@@ -73,7 +73,7 @@ enum fcp_resp_rsp_codes {
 #define FCP_PTA_SIMPLE      0   /* simple task attribute */
 #define FCP_PTA_HEADQ       1   /* head of queue task attribute */
 #define FCP_PTA_ORDERED     2   /* ordered task attribute */
-#define FCP_PTA_ACA         4   /* auto. contigent allegiance */
+#define FCP_PTA_ACA         4   /* auto. contingent allegiance */
 #define FCP_PTA_MASK        7   /* mask for task attribute field */
 #define FCP_PRI_SHIFT       3   /* priority field starts in bit 3 */
 #define FCP_PRI_RESVD_MASK  0x80        /* reserved bits in priority field */
@@ -3980,7 +3980,7 @@ void qlt_async_event(uint16_t code, struct scsi_qla_host *vha,
         case MBA_RSP_TRANSFER_ERR:      /* Response Transfer Error */
                 ql_dbg(ql_dbg_tgt_mgt, vha, 0xf03a,
                     "qla_target(%d): System error async event %#x "
-                    "occured", vha->vp_idx, code);
+                    "occurred", vha->vp_idx, code);
                 break;
         case MBA_WAKEUP_THRES:          /* Request Queue Wake-up. */
                 set_bit(ISP_ABORT_NEEDED, &vha->dpc_flags);
@@ -3989,7 +3989,7 @@ void qlt_async_event(uint16_t code, struct scsi_qla_host *vha,
         case MBA_LOOP_UP:
         {
                 ql_dbg(ql_dbg_tgt_mgt, vha, 0xf03b,
-                    "qla_target(%d): Async LOOP_UP occured "
+                    "qla_target(%d): Async LOOP_UP occurred "
                     "(m[0]=%x, m[1]=%x, m[2]=%x, m[3]=%x)", vha->vp_idx,
                     le16_to_cpu(mailbox[0]), le16_to_cpu(mailbox[1]),
                     le16_to_cpu(mailbox[2]), le16_to_cpu(mailbox[3]));
@@ -4006,7 +4006,7 @@ void qlt_async_event(uint16_t code, struct scsi_qla_host *vha,
         case MBA_LIP_RESET:
         case MBA_RSCN_UPDATE:
                 ql_dbg(ql_dbg_tgt_mgt, vha, 0xf03c,
-                    "qla_target(%d): Async event %#x occured "
+                    "qla_target(%d): Async event %#x occurred "
                     "(m[0]=%x, m[1]=%x, m[2]=%x, m[3]=%x)", vha->vp_idx, code,
                     le16_to_cpu(mailbox[0]), le16_to_cpu(mailbox[1]),
                     le16_to_cpu(mailbox[2]), le16_to_cpu(mailbox[3]));
@@ -4015,7 +4015,7 @@ void qlt_async_event(uint16_t code, struct scsi_qla_host *vha,
         case MBA_PORT_UPDATE:
                 ql_dbg(ql_dbg_tgt_mgt, vha, 0xf03d,
                     "qla_target(%d): Port update async event %#x "
-                    "occured: updating the ports database (m[0]=%x, m[1]=%x, "
+                    "occurred: updating the ports database (m[0]=%x, m[1]=%x, "
                     "m[2]=%x, m[3]=%x)", vha->vp_idx, code,
                     le16_to_cpu(mailbox[0]), le16_to_cpu(mailbox[1]),
                     le16_to_cpu(mailbox[2]), le16_to_cpu(mailbox[3]));
@@ -4031,7 +4031,7 @@ void qlt_async_event(uint16_t code, struct scsi_qla_host *vha,
 
         default:
                 ql_dbg(ql_dbg_tgt_mgt, vha, 0xf040,
-                    "qla_target(%d): Async event %#x occured: "
+                    "qla_target(%d): Async event %#x occurred: "
                     "ignore (m[0]=%x, m[1]=%x, m[2]=%x, m[3]=%x)", vha->vp_idx,
                     code, le16_to_cpu(mailbox[0]), le16_to_cpu(mailbox[1]),
                     le16_to_cpu(mailbox[2]), le16_to_cpu(mailbox[3]));
diff --git a/drivers/scsi/qla2xxx/tcm_qla2xxx.c b/drivers/scsi/qla2xxx/tcm_qla2xxx.c
index 3d74f2f39ae1..4372e32bc95f 100644
--- a/drivers/scsi/qla2xxx/tcm_qla2xxx.c
+++ b/drivers/scsi/qla2xxx/tcm_qla2xxx.c
@@ -367,7 +367,7 @@ static struct se_node_acl *tcm_qla2xxx_alloc_fabric_acl(
 
         nacl = kzalloc(sizeof(struct tcm_qla2xxx_nacl), GFP_KERNEL);
         if (!nacl) {
-                pr_err("Unable to alocate struct tcm_qla2xxx_nacl\n");
+                pr_err("Unable to allocate struct tcm_qla2xxx_nacl\n");
                 return NULL;
         }
 
diff --git a/drivers/scsi/scsi_transport_srp.c b/drivers/scsi/scsi_transport_srp.c
index 21a045e0559f..f379c7f3034c 100644
--- a/drivers/scsi/scsi_transport_srp.c
+++ b/drivers/scsi/scsi_transport_srp.c
@@ -38,7 +38,7 @@ struct srp_host_attrs {
 #define to_srp_host_attrs(host) ((struct srp_host_attrs *)(host)->shost_data)
 
 #define SRP_HOST_ATTRS 0
-#define SRP_RPORT_ATTRS 2
+#define SRP_RPORT_ATTRS 3
 
 struct srp_internal {
         struct scsi_transport_template t;
@@ -47,7 +47,6 @@ struct srp_internal {
         struct device_attribute *host_attrs[SRP_HOST_ATTRS + 1];
 
         struct device_attribute *rport_attrs[SRP_RPORT_ATTRS + 1];
-        struct device_attribute private_rport_attrs[SRP_RPORT_ATTRS];
         struct transport_container rport_attr_cont;
 };
 
@@ -72,24 +71,6 @@ static DECLARE_TRANSPORT_CLASS(srp_host_class, "srp_host", srp_host_setup,
 static DECLARE_TRANSPORT_CLASS(srp_rport_class, "srp_remote_ports",
                                NULL, NULL, NULL);
 
-#define SETUP_TEMPLATE(attrb, field, perm, test, ro_test, ro_perm)      \
-        i->private_##attrb[count] = dev_attr_##field;           \
-        i->private_##attrb[count].attr.mode = perm;                     \
-        if (ro_test) {                                                  \
-                i->private_##attrb[count].attr.mode = ro_perm;          \
-                i->private_##attrb[count].store = NULL;                 \
-        }                                                               \
-        i->attrb[count] = &i->private_##attrb[count];                   \
-        if (test)                                                       \
-                count++
-
-#define SETUP_RPORT_ATTRIBUTE_RD(field)                                 \
-        SETUP_TEMPLATE(rport_attrs, field, S_IRUGO, 1, 0, 0)
-
-#define SETUP_RPORT_ATTRIBUTE_RW(field)                                 \
-        SETUP_TEMPLATE(rport_attrs, field, S_IRUGO | S_IWUSR,           \
-                       1, 1, S_IRUGO)
-
 #define SRP_PID(p) \
         (p)->port_id[0], (p)->port_id[1], (p)->port_id[2], (p)->port_id[3], \
         (p)->port_id[4], (p)->port_id[5], (p)->port_id[6], (p)->port_id[7], \
@@ -135,6 +116,24 @@ show_srp_rport_roles(struct device *dev, struct device_attribute *attr,
 
 static DEVICE_ATTR(roles, S_IRUGO, show_srp_rport_roles, NULL);
 
+static ssize_t store_srp_rport_delete(struct device *dev,
+                                      struct device_attribute *attr,
+                                      const char *buf, size_t count)
+{
+        struct srp_rport *rport = transport_class_to_srp_rport(dev);
+        struct Scsi_Host *shost = dev_to_shost(dev);
+        struct srp_internal *i = to_srp_internal(shost->transportt);
+
+        if (i->f->rport_delete) {
+                i->f->rport_delete(rport);
+                return count;
+        } else {
+                return -ENOSYS;
+        }
+}
+
+static DEVICE_ATTR(delete, S_IWUSR, NULL, store_srp_rport_delete);
+
 static void srp_rport_release(struct device *dev)
 {
         struct srp_rport *rport = dev_to_rport(dev);
@@ -324,12 +323,16 @@ srp_attach_transport(struct srp_function_template *ft)
         i->rport_attr_cont.ac.attrs = &i->rport_attrs[0];
         i->rport_attr_cont.ac.class = &srp_rport_class.class;
         i->rport_attr_cont.ac.match = srp_rport_match;
-        transport_container_register(&i->rport_attr_cont);
 
         count = 0;
-        SETUP_RPORT_ATTRIBUTE_RD(port_id);
-        SETUP_RPORT_ATTRIBUTE_RD(roles);
-        i->rport_attrs[count] = NULL;
+        i->rport_attrs[count++] = &dev_attr_port_id;
+        i->rport_attrs[count++] = &dev_attr_roles;
+        if (ft->rport_delete)
+                i->rport_attrs[count++] = &dev_attr_delete;
+        i->rport_attrs[count++] = NULL;
+        BUG_ON(count > ARRAY_SIZE(i->rport_attrs));
+
+        transport_container_register(&i->rport_attr_cont);
 
         i->f = ft;