aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorStefan Richter <stefanr@s5r6.in-berlin.de>2006-11-02 15:16:08 -0500
committerStefan Richter <stefanr@s5r6.in-berlin.de>2006-12-07 16:49:39 -0500
commit5796aa7b11a6ba9d28a523fc82dddbc96c1a175e (patch)
tree6eb5a670cd0bd8aa6e5cd9521d9f9aad695ed322 /drivers
parente8ca5668f1546dacc85abcc06511ed113fd929c3 (diff)
ieee1394: sbp2: some conditions in queue_command are unlikely
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/ieee1394/sbp2.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/ieee1394/sbp2.c b/drivers/ieee1394/sbp2.c
index 625f1eb80698..96a743d9b5d5 100644
--- a/drivers/ieee1394/sbp2.c
+++ b/drivers/ieee1394/sbp2.c
@@ -1910,12 +1910,12 @@ static int sbp2scsi_queuecommand(struct scsi_cmnd *SCpnt,
1910 struct sbp2scsi_host_info *hi; 1910 struct sbp2scsi_host_info *hi;
1911 int result = DID_NO_CONNECT << 16; 1911 int result = DID_NO_CONNECT << 16;
1912 1912
1913 if (!sbp2util_node_is_available(scsi_id)) 1913 if (unlikely(!sbp2util_node_is_available(scsi_id)))
1914 goto done; 1914 goto done;
1915 1915
1916 hi = scsi_id->hi; 1916 hi = scsi_id->hi;
1917 1917
1918 if (!hi) { 1918 if (unlikely(!hi)) {
1919 SBP2_ERR("sbp2scsi_host_info is NULL - this is bad!"); 1919 SBP2_ERR("sbp2scsi_host_info is NULL - this is bad!");
1920 goto done; 1920 goto done;
1921 } 1921 }
@@ -1923,7 +1923,7 @@ static int sbp2scsi_queuecommand(struct scsi_cmnd *SCpnt,
1923 /* Multiple units are currently represented to the SCSI core as separate 1923 /* Multiple units are currently represented to the SCSI core as separate
1924 * targets, not as one target with multiple LUs. Therefore return 1924 * targets, not as one target with multiple LUs. Therefore return
1925 * selection time-out to any IO directed at non-zero LUNs. */ 1925 * selection time-out to any IO directed at non-zero LUNs. */
1926 if (SCpnt->device->lun) 1926 if (unlikely(SCpnt->device->lun))
1927 goto done; 1927 goto done;
1928 1928
1929 /* handle the request sense command here (auto-request sense) */ 1929 /* handle the request sense command here (auto-request sense) */
@@ -1934,7 +1934,7 @@ static int sbp2scsi_queuecommand(struct scsi_cmnd *SCpnt,
1934 return 0; 1934 return 0;
1935 } 1935 }
1936 1936
1937 if (!hpsb_node_entry_valid(scsi_id->ne)) { 1937 if (unlikely(!hpsb_node_entry_valid(scsi_id->ne))) {
1938 SBP2_ERR("Bus reset in progress - rejecting command"); 1938 SBP2_ERR("Bus reset in progress - rejecting command");
1939 result = DID_BUS_BUSY << 16; 1939 result = DID_BUS_BUSY << 16;
1940 goto done; 1940 goto done;
@@ -1942,7 +1942,7 @@ static int sbp2scsi_queuecommand(struct scsi_cmnd *SCpnt,
1942 1942
1943 /* Bidirectional commands are not yet implemented, 1943 /* Bidirectional commands are not yet implemented,
1944 * and unknown transfer direction not handled. */ 1944 * and unknown transfer direction not handled. */
1945 if (SCpnt->sc_data_direction == DMA_BIDIRECTIONAL) { 1945 if (unlikely(SCpnt->sc_data_direction == DMA_BIDIRECTIONAL)) {
1946 SBP2_ERR("Cannot handle DMA_BIDIRECTIONAL - rejecting command"); 1946 SBP2_ERR("Cannot handle DMA_BIDIRECTIONAL - rejecting command");
1947 result = DID_ERROR << 16; 1947 result = DID_ERROR << 16;
1948 goto done; 1948 goto done;