SCSI / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM

[cascardo/linux.git] / drivers / scsi / megaraid.c

diff --git a/drivers/scsi/megaraid.c b/drivers/scsi/megaraid.c
index b777051..2485255 100644 (file)
--- a/drivers/scsi/megaraid.c
+++ b/drivers/scsi/megaraid.c
@@ -1860,7 +1860,7 @@ megaraid_info(struct Scsi_Host *host)
                 "LSI Logic MegaRAID %s %d commands %d targs %d chans %d luns",
                 adapter->fw_version, adapter->product_info.max_commands,
                 adapter->host->max_id, adapter->host->max_channel,
-                adapter->host->max_lun);
+                (u32)adapter->host->max_lun);
        return buffer;
 }
 
@@ -1941,11 +1941,11 @@ megaraid_abort_and_reset(adapter_t *adapter, Scsi_Cmnd *cmd, int aor)
 
        printk(KERN_WARNING "megaraid: %s cmd=%x <c=%d t=%d l=%d>\n",
             (aor == SCB_ABORT)? "ABORTING":"RESET",
-            cmd->cmnd[0], cmd->device->channel, 
-            cmd->device->id, cmd->device->lun);
+            cmd->cmnd[0], cmd->device->channel,
+            cmd->device->id, (u32)cmd->device->lun);
 
        if(list_empty(&adapter->pending_list))
-               return FALSE;
+               return FAILED;
 
        list_for_each_safe(pos, next, &adapter->pending_list) {
 
@@ -1968,7 +1968,7 @@ megaraid_abort_and_reset(adapter_t *adapter, Scsi_Cmnd *cmd, int aor)
                                        (aor==SCB_ABORT) ? "ABORTING":"RESET",
                                        scb->idx);
 
-                               return FALSE;
+                               return FAILED;
                        }
                        else {
 
@@ -1993,12 +1993,12 @@ megaraid_abort_and_reset(adapter_t *adapter, Scsi_Cmnd *cmd, int aor)
                                list_add_tail(SCSI_LIST(cmd),
                                                &adapter->completed_list);
 
-                               return TRUE;
+                               return SUCCESS;
                        }
                }
        }
 
-       return FALSE;
+       return FAILED;
 }
 
 static inline int