2 files changed, 3 insertions, 10 deletions

diff --git a/drivers/ieee1394/sbp2.c b/drivers/ieee1394/sbp2.c
index e312d5e2a647..670a13981fd0 100644
--- a/drivers/ieee1394/sbp2.c
+++ b/drivers/ieee1394/sbp2.c
@@ -1964,7 +1964,7 @@ static void sbp2_create_command_orb(struct scsi_id_instance_data *scsi_id,
 /*
  * This function is called in order to begin a regular SBP-2 command.
  */
-static int sbp2_link_orb_command(struct scsi_id_instance_data *scsi_id,
+static void sbp2_link_orb_command(struct scsi_id_instance_data *scsi_id,
                                  struct sbp2_command_info *command)
 {
         struct sbp2scsi_host_info *hi = scsi_id->hi;
@@ -2030,11 +2030,9 @@ static int sbp2_link_orb_command(struct scsi_id_instance_data *scsi_id,
 
         SBP2_ORB_DEBUG("write to %s register, command orb %p",
                         last_orb ? "DOORBELL" : "ORB_POINTER", command_orb);
-        if (sbp2util_node_write_no_wait(scsi_id->ne, addr, data, length) < 0) {
+        if (sbp2util_node_write_no_wait(scsi_id->ne, addr, data, length))
                 SBP2_ERR("sbp2util_node_write_no_wait failed.\n");
-                return -EIO;
-        }
-        return 0;
+        /* We rely on SCSI EH to deal with _node_write_ failures. */
 }
 
 /*
diff --git a/drivers/ieee1394/sbp2.h b/drivers/ieee1394/sbp2.h
index dd80906e8a92..b17016b7cfcf 100644
--- a/drivers/ieee1394/sbp2.h
+++ b/drivers/ieee1394/sbp2.h
@@ -390,11 +390,6 @@ static int sbp2_logout_device(struct scsi_id_instance_data *scsi_id);
 static int sbp2_handle_status_write(struct hpsb_host *host, int nodeid, int destid,
                                     quadlet_t *data, u64 addr, size_t length, u16 flags);
 static int sbp2_agent_reset(struct scsi_id_instance_data *scsi_id, int wait);
-static int sbp2_link_orb_command(struct scsi_id_instance_data *scsi_id,
-                                 struct sbp2_command_info *command);
-static int sbp2_send_command(struct scsi_id_instance_data *scsi_id,
-                             struct scsi_cmnd *SCpnt,
-                             void (*done)(struct scsi_cmnd *));
 static unsigned int sbp2_status_to_sense_data(unchar *sbp2_status,
                                               unchar *sense_data);
 static void sbp2_parse_unit_directory(struct scsi_id_instance_data *scsi_id,