Imported linux-2.6.27.39 suse/xen patches.

[people/ummeegge/ipfire-2.x.git] / src / patches / suse-2.6.27.39 / patches.drivers / mpt-fusion-4.00.43.00-update

diff --git a/src/patches/suse-2.6.27.31/patches.drivers/mpt-fusion-4.00.43.00-update b/src/patches/suse-2.6.27.39/patches.drivers/mpt-fusion-4.00.43.00-update
similarity index 99%
rename from src/patches/suse-2.6.27.31/patches.drivers/mpt-fusion-4.00.43.00-update
rename to src/patches/suse-2.6.27.39/patches.drivers/mpt-fusion-4.00.43.00-update
index 139298f2db9bd1e18bc07a104ce7afb511aa09ee..e2d32202a3a6cb571ff858ff20cbbd71ca2532fb 100644 (file)
--- a/src/patches/suse-2.6.27.31/patches.drivers/mpt-fusion-4.00.43.00-update
+++ b/src/patches/suse-2.6.27.39/patches.drivers/mpt-fusion-4.00.43.00-update
@@ -4148,7 +4148,7 @@ Signed-off-by: Hannes Reinecke <hare@suse.de>
 +      if (copy_to_user(uarg, pKarg, copy_buffer_sz)) {
 +              printk(KERN_ERR "%s@%d::%s() - "
 +                     "Unable to write out csmi_sas_get_raid_config @ %p\n",
-+                         __FILE__, __LINE__, __FUNCTION__, uarg);
++                         __FILE__, __LINE__, __FUNCTION__, uarg);
 +              free_pages((unsigned long)pKarg, memory_pages);
 +              return -EFAULT;
 +      }
@@ -5462,7 +5462,7 @@ Signed-off-by: Hannes Reinecke <hare@suse.de>
 +      cfg.action = MPI_CONFIG_ACTION_PAGE_READ_CURRENT;
 +      cfg.pageAddr = (bus << 8) + id
 +          + (MPI_SAS_DEVICE_PGAD_FORM_BUS_TARGET_ID <<
-+              MPI_SAS_DEVICE_PGAD_FORM_SHIFT);
++              MPI_SAS_DEVICE_PGAD_FORM_SHIFT);
 +
 +      if ((rc = mpt_config(ioc, &cfg)) != 0) {
 +              rc=-1;
@@ -10381,7 +10381,7 @@ Signed-off-by: Hannes Reinecke <hare@suse.de>
 -              dexitprintk(ioc, printk(MYIOC_s_INFO_FMT "free  @ %p, sz=%d bytes\n",
 -                  ioc->name, ioc->alloc, ioc->alloc_sz));
 +              dexitprintk(ioc, printk(MYIOC_s_DEBUG_FMT "free  @ %p, sz=%d bytes\n",
-+                      ioc->name, ioc->alloc, ioc->alloc_sz));
++                      ioc->name, ioc->alloc, ioc->alloc_sz));
                pci_free_consistent(ioc->pcidev, sz,
                                ioc->alloc, ioc->alloc_dma);
                ioc->reply_frames = NULL;
@@ -14942,7 +14942,7 @@ Signed-off-by: Hannes Reinecke <hare@suse.de>
        if (numfrags > maxfrags) {
                ret = -EMLINK;
 -              goto fwdl_out;
-+              goto fwdl_out;
++              goto fwdl_out;
        }
  
        dctlprintk(iocp, printk(MYIOC_s_DEBUG_FMT "DbG: sgl buffer = %p, sgfrags = %d\n",
@@ -19195,9 +19195,9 @@ Signed-off-by: Hannes Reinecke <hare@suse.de>
 +                      starget_printk(KERN_INFO, starget, MYIOC_s_FMT
 +                      "delete device: fw_channel %d, fw_id %d, phy %d, "
 +                      "sas_addr 0x%llx\n", ioc->name,
-+                      p->phy_info[i].attached.channel,
++                      p->phy_info[i].attached.channel,
 +                      p->phy_info[i].attached.id,
-+                      p->phy_info[i].attached.phy_id, (unsigned long long)
++                      p->phy_info[i].attached.phy_id, (unsigned long long)
 +                      p->phy_info[i].attached.sas_address);
 +
 +                      mptsas_port_delete(ioc, p->phy_info[i].port_details);
@@ -20884,7 +20884,7 @@ Signed-off-by: Hannes Reinecke <hare@suse.de>
 +      if (!phy_info->port_details) {
 +              dfailprintk(ioc, printk(MYIOC_s_ERR_FMT
 +                      "%s: fw_id=%d exit at line=%d\n", ioc->name,
-+                      __FUNCTION__, fw_id, __LINE__));
++                      __FUNCTION__, fw_id, __LINE__));
 +              return;
        }
 -
@@ -20895,7 +20895,7 @@ Signed-off-by: Hannes Reinecke <hare@suse.de>
 +      if (!rphy) {
 +              dfailprintk(ioc, printk(MYIOC_s_ERR_FMT
 +                      "%s: fw_id=%d exit at line=%d\n", ioc->name,
-+                      __FUNCTION__, fw_id, __LINE__));
++                      __FUNCTION__, fw_id, __LINE__));
 +              return;
 +      }
 +      if (phy_info->attached.device_info &
@@ -20921,7 +20921,7 @@ Signed-off-by: Hannes Reinecke <hare@suse.de>
 +      if (!port) {
 +              dfailprintk(ioc, printk(MYIOC_s_ERR_FMT
 +                      "%s: fw_id=%d exit at line=%d\n", ioc->name,
-+                      __FUNCTION__, fw_id, __LINE__));
++                      __FUNCTION__, fw_id, __LINE__));
 +              return;
 +      }
 +      port_info = phy_info->portinfo;
@@ -21209,7 +21209,7 @@ Signed-off-by: Hannes Reinecke <hare@suse.de>
 +                  (hot_plug_info->channel << 8) + hot_plug_info->id)) {
 +                      dfailprintk(ioc, printk(MYIOC_s_ERR_FMT
 +                      "%s: fw_id=%d exit at line=%d\n", ioc->name,
-+                              __FUNCTION__, hot_plug_info->id, __LINE__));
++                      __FUNCTION__, hot_plug_info->id, __LINE__));
 +                      break;
 +              }
  
@@ -21225,7 +21225,7 @@ Signed-off-by: Hannes Reinecke <hare@suse.de>
 +              if (!phy_info){
 +                      dfailprintk(ioc, printk(MYIOC_s_ERR_FMT
 +                              "%s: fw_id=%d exit at line=%d\n", ioc->name,
-+                              __FUNCTION__, hot_plug_info->id, __LINE__));
++                              __FUNCTION__, hot_plug_info->id, __LINE__));
 +                      break;
 +              }
  
@@ -22708,7 +22708,7 @@ Signed-off-by: Hannes Reinecke <hare@suse.de>
 +                                         depth);
 +                              else if (depth < 0)
 +                                      sdev_printk(KERN_INFO, sdev,
-+                                      "Tagged Command Queueing is being "
++                                      "Tagged Command Queueing is being "
 +                                      "disabled\n");
 +                              else if (depth == 0)
 +                                      sdev_printk(KERN_INFO, sdev,
@@ -27716,7 +27716,7 @@ Signed-off-by: Hannes Reinecke <hare@suse.de>
 +      }
 +
 +      dctlprintk(ioc, printk(MYIOC_s_DEBUG_FMT "%s enter.\n", ioc->name,
-+              __FUNCTION__));
++              __FUNCTION__));
 +      buffer_type = karg.data.BufferType;
 +      if (!(ioc->facts.IOCCapabilities & MPT_DIAG_CAPABILITY(buffer_type))) {
 +              printk(MYIOC_s_DEBUG_FMT "%s: doesn't have Capability for "
@@ -27761,7 +27761,7 @@ Signed-off-by: Hannes Reinecke <hare@suse.de>
 +                          " FAILED, (request_sz=%d)\n", ioc->name,
 +                          __FUNCTION__, request_data_sz);
 +                      mpt_free_msg_frame(ioc, mf);
-+                      return -EAGAIN;
++                      return -EAGAIN;
 +              }
 +              ioc->DiagBuffer[buffer_type] = request_data;
 +              ioc->DiagBuffer_sz[buffer_type] = request_data_sz;
@@ -27769,7 +27769,7 @@ Signed-off-by: Hannes Reinecke <hare@suse.de>
 +      }
 +
 +      ioc->DiagBuffer_Status[buffer_type] = 0;
-+      diag_buffer_post_request = (DiagBufferPostRequest_t *)mf;
++      diag_buffer_post_request = (DiagBufferPostRequest_t *)mf;
 +      diag_buffer_post_request->Function = MPI_FUNCTION_DIAG_BUFFER_POST;
 +      diag_buffer_post_request->ChainOffset = 0;
 +      diag_buffer_post_request->BufferType = karg.data.BufferType;
@@ -27811,7 +27811,7 @@ Signed-off-by: Hannes Reinecke <hare@suse.de>
 +      if (!(ioc->ioctl_cmds.status & MPT_MGMT_STATUS_COMMAND_GOOD)) {
 +              rc = -ETIME;
 +              printk(MYIOC_s_WARN_FMT "%s: failed\n", ioc->name,
-+                  __FUNCTION__);
++                      __FUNCTION__);
 +              if (ioc->ioctl_cmds.status & MPT_MGMT_STATUS_DID_IOCRESET) {
 +                      mpt_free_msg_frame(ioc, mf);
 +                      goto out;
@@ -27896,7 +27896,7 @@ Signed-off-by: Hannes Reinecke <hare@suse.de>
 +      }
 +
 +      dctlprintk(ioc, printk(MYIOC_s_DEBUG_FMT "%s enter.\n", ioc->name,
-+              __FUNCTION__));
++              __FUNCTION__));
 +      buffer_type = karg.data.UniqueId & 0x000000ff;
 +      if (!(ioc->facts.IOCCapabilities & MPT_DIAG_CAPABILITY(buffer_type))) {
 +              printk(MYIOC_s_DEBUG_FMT "%s: doesn't have Capability for "
@@ -27905,7 +27905,7 @@ Signed-off-by: Hannes Reinecke <hare@suse.de>
 +      }
 +
 +      if ((ioc->DiagBuffer_Status[buffer_type] &
-+              MPT_DIAG_BUFFER_IS_REGISTERED) == 0 ) {
++              MPT_DIAG_BUFFER_IS_REGISTERED) == 0 ) {
 +              printk(MYIOC_s_DEBUG_FMT "%s: buffer_type=%x is not "
 +                  "registered\n", ioc->name, __FUNCTION__, buffer_type);
 +              return -EFAULT;
@@ -27955,7 +27955,7 @@ Signed-off-by: Hannes Reinecke <hare@suse.de>
 +      if (!(ioc->ioctl_cmds.status & MPT_MGMT_STATUS_COMMAND_GOOD)) {
 +              rc = -ETIME;
 +              printk(MYIOC_s_WARN_FMT "%s: failed\n", ioc->name,
-+                  __FUNCTION__);
++                      __FUNCTION__);
 +              if (ioc->ioctl_cmds.status & MPT_MGMT_STATUS_DID_IOCRESET) {
 +                      mpt_free_msg_frame(ioc, mf);
 +                      goto out;
@@ -28111,7 +28111,7 @@ Signed-off-by: Hannes Reinecke <hare@suse.de>
 +      }
 +
 +      dctlprintk(ioc, printk(MYIOC_s_DEBUG_FMT "%s enter.\n", ioc->name,
-+              __FUNCTION__));
++              __FUNCTION__));
 +      buffer_type = karg.data.BufferType;
 +      if (!(ioc->facts.IOCCapabilities & MPT_DIAG_CAPABILITY(buffer_type))) {
 +              printk(MYIOC_s_DEBUG_FMT "%s: doesn't have Capability for "
@@ -28120,7 +28120,7 @@ Signed-off-by: Hannes Reinecke <hare@suse.de>
 +      }
 +
 +      if ((ioc->DiagBuffer_Status[buffer_type] &
-+              MPT_DIAG_BUFFER_IS_REGISTERED) == 0) {
++              MPT_DIAG_BUFFER_IS_REGISTERED) == 0) {
 +              printk(MYIOC_s_DEBUG_FMT "%s: buffer_type=%x is not "
 +                  "registered\n", ioc->name, __FUNCTION__, buffer_type);
 +              goto out;
@@ -28301,7 +28301,7 @@ Signed-off-by: Hannes Reinecke <hare@suse.de>
 +      if (!(ioc->ioctl_cmds.status & MPT_MGMT_STATUS_COMMAND_GOOD)) {
 +              rc = -ETIME;
 +              printk(MYIOC_s_WARN_FMT "%s: failed\n", ioc->name,
-+                  __FUNCTION__);
++                      __FUNCTION__);
 +              if (ioc->ioctl_cmds.status & MPT_MGMT_STATUS_DID_IOCRESET) {
 +                      mpt_free_msg_frame(ioc, mf);
 +                      goto out;