From: Stefan Richter Since sbp2 is at the moment unable to do anything with the return value of sbp2_link_orb_command, just discard it. Signed-off-by: Stefan Richter Cc: Jody McIntyre Cc: Ben Collins Signed-off-by: Andrew Morton --- drivers/ieee1394/sbp2.c | 8 +++----- drivers/ieee1394/sbp2.h | 5 ----- 2 files changed, 3 insertions(+), 10 deletions(-) diff -puN drivers/ieee1394/sbp2.c~ieee1394-sbp2-discard-return-value-of drivers/ieee1394/sbp2.c --- a/drivers/ieee1394/sbp2.c~ieee1394-sbp2-discard-return-value-of +++ a/drivers/ieee1394/sbp2.c @@ -1964,7 +1964,7 @@ static void sbp2_create_command_orb(stru /* * 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 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 -puN drivers/ieee1394/sbp2.h~ieee1394-sbp2-discard-return-value-of drivers/ieee1394/sbp2.h --- a/drivers/ieee1394/sbp2.h~ieee1394-sbp2-discard-return-value-of +++ a/drivers/ieee1394/sbp2.h @@ -390,11 +390,6 @@ static int sbp2_logout_device(struct scs 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, _