All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH v1.3 6/11] arcmsr: Rewrite arcmsr_message_isr_bh_fn function
@ 2014-02-21  4:07 黃清隆
  0 siblings, 0 replies; only message in thread
From: 黃清隆 @ 2014-02-21  4:07 UTC (permalink / raw)
  To: jbottomley, linux-scsi, linux-kernel, Dan Carpenter
  Cc: fengguang.wu, Tomas Henzl

From: Ching <ching2048@areca.com.tw>

Rewrite arcmsr_message_isr_bh_fn function

Singed-off-by: Ching <ching2048@areca.com.tw>
---


diff -uprN a/drivers/scsi/arcmsr/arcmsr_hba.c b/drivers/scsi/arcmsr/arcmsr_hba.c
--- a/drivers/scsi/arcmsr/arcmsr_hba.c  2014-02-21 02:02:34.000000000 +0800
+++ b/drivers/scsi/arcmsr/arcmsr_hba.c  2014-02-21 02:03:28.000000000 +0800
@@ -489,121 +489,68 @@ static int arcmsr_alloc_ccb_pool(struct
        return 0;
 }

-static void arcmsr_message_isr_bh_fn(struct work_struct *work)
+static void
+arcmsr_message_isr_bh_fn(struct work_struct *work)
 {
-       struct AdapterControlBlock *acb = container_of(work,struct
AdapterControlBlock, arcmsr_do_message_isr_bh);
-       switch (acb->adapter_type) {
-               case ACB_ADAPTER_TYPE_A: {
-
-                       struct MessageUnit_A __iomem *reg  = acb->pmuA;
-                       char *acb_dev_map = (char *)acb->device_map;
-                       uint32_t __iomem *signature = (uint32_t
__iomem*) (&reg->message_rwbuffer[0]);
-                       char __iomem *devicemap = (char __iomem*)
(&reg->message_rwbuffer[21]);
-                       int target, lun;
-                       struct scsi_device *psdev;
-                       char diff;
+       struct AdapterControlBlock *acb = container_of(work,
+               struct AdapterControlBlock, arcmsr_do_message_isr_bh);
+       char *acb_dev_map = (char *)acb->device_map;
+       uint32_t __iomem *signature = NULL;
+       char __iomem *devicemap = NULL;
+       int target, lun;
+       struct scsi_device *psdev;
+       char diff, temp;

-                       atomic_inc(&acb->rq_map_token);
-                       if (readl(signature) == ARCMSR_SIGNATURE_GET_CONFIG) {
-                               for(target = 0; target <
ARCMSR_MAX_TARGETID -1; target++) {
-                                       diff = (*acb_dev_map)^readb(devicemap);
-                                       if (diff != 0) {
-                                               char temp;
-                                               *acb_dev_map = readb(devicemap);
-                                               temp =*acb_dev_map;
-                                               for(lun = 0; lun <
ARCMSR_MAX_TARGETLUN; lun++) {
-                                                       if((temp &
0x01)==1 && (diff & 0x01) == 1) {
-
scsi_add_device(acb->host, 0, target, lun);
-                                                       }else if((temp
& 0x01) == 0 && (diff & 0x01) == 1) {
-                                                               psdev
= scsi_device_lookup(acb->host, 0, target, lun);
-                                                               if
(psdev != NULL ) {
-
 scsi_remove_device(psdev);
-
 scsi_device_put(psdev);
-                                                               }
-                                                       }
-                                                       temp >>= 1;
-                                                       diff >>= 1;
-                                               }
-                                       }
-                                       devicemap++;
-                                       acb_dev_map++;
-                               }
-                       }
-                       break;
+       switch (acb->adapter_type) {
+       case ACB_ADAPTER_TYPE_A: {
+               struct MessageUnit_A __iomem *reg  = acb->pmuA;
+               signature = (uint32_t __iomem *)(&reg->message_rwbuffer[0]);
+               devicemap = (char __iomem *)(&reg->message_rwbuffer[21]);
+               break;
                }
-
-               case ACB_ADAPTER_TYPE_B: {
-                       struct MessageUnit_B *reg  = acb->pmuB;
-                       char *acb_dev_map = (char *)acb->device_map;
-                       uint32_t __iomem *signature = (uint32_t
__iomem*)(&reg->message_rwbuffer[0]);
-                       char __iomem *devicemap = (char
__iomem*)(&reg->message_rwbuffer[21]);
-                       int target, lun;
-                       struct scsi_device *psdev;
-                       char diff;
-
-                       atomic_inc(&acb->rq_map_token);
-                       if (readl(signature) == ARCMSR_SIGNATURE_GET_CONFIG) {
-                               for(target = 0; target <
ARCMSR_MAX_TARGETID -1; target++) {
-                                       diff = (*acb_dev_map)^readb(devicemap);
-                                       if (diff != 0) {
-                                               char temp;
-                                               *acb_dev_map = readb(devicemap);
-                                               temp =*acb_dev_map;
-                                               for(lun = 0; lun <
ARCMSR_MAX_TARGETLUN; lun++) {
-                                                       if((temp &
0x01)==1 && (diff & 0x01) == 1) {
-
scsi_add_device(acb->host, 0, target, lun);
-                                                       }else if((temp
& 0x01) == 0 && (diff & 0x01) == 1) {
-                                                               psdev
= scsi_device_lookup(acb->host, 0, target, lun);
-                                                               if
(psdev != NULL ) {
-
 scsi_remove_device(psdev);
-
 scsi_device_put(psdev);
-                                                               }
-                                                       }
-                                                       temp >>= 1;
-                                                       diff >>= 1;
-                                               }
-                                       }
-                                       devicemap++;
-                                       acb_dev_map++;
-                               }
-                       }
+       case ACB_ADAPTER_TYPE_B: {
+               struct MessageUnit_B *reg  = acb->pmuB;
+               signature = (uint32_t __iomem *)(&reg->message_rwbuffer[0]);
+               devicemap = (char __iomem *)(&reg->message_rwbuffer[21]);
+               break;
                }
+       case ACB_ADAPTER_TYPE_C: {
+               struct MessageUnit_C __iomem *reg  = acb->pmuC;
+               signature = (uint32_t __iomem *)(&reg->msgcode_rwbuffer[0]);
+               devicemap = (char __iomem *)(&reg->msgcode_rwbuffer[21]);
                break;
-               case ACB_ADAPTER_TYPE_C: {
-                       struct MessageUnit_C *reg  = acb->pmuC;
-                       char *acb_dev_map = (char *)acb->device_map;
-                       uint32_t __iomem *signature = (uint32_t
__iomem *)(&reg->msgcode_rwbuffer[0]);
-                       char __iomem *devicemap = (char __iomem
*)(&reg->msgcode_rwbuffer[21]);
-                       int target, lun;
-                       struct scsi_device *psdev;
-                       char diff;
-
-                       atomic_inc(&acb->rq_map_token);
-                       if (readl(signature) == ARCMSR_SIGNATURE_GET_CONFIG) {
-                               for (target = 0; target <
ARCMSR_MAX_TARGETID - 1; target++) {
-                                       diff = (*acb_dev_map)^readb(devicemap);
-                                       if (diff != 0) {
-                                               char temp;
-                                               *acb_dev_map = readb(devicemap);
-                                               temp = *acb_dev_map;
-                                               for (lun = 0; lun <
ARCMSR_MAX_TARGETLUN; lun++) {
-                                                       if ((temp &
0x01) == 1 && (diff & 0x01) == 1) {
-
scsi_add_device(acb->host, 0, target, lun);
-                                                       } else if
((temp & 0x01) == 0 && (diff & 0x01) == 1) {
-                                                               psdev
= scsi_device_lookup(acb->host, 0, target, lun);
-                                                               if
(psdev != NULL) {
-
 scsi_remove_device(psdev);
-
 scsi_device_put(psdev);
-                                                               }
-                                                       }
-                                                       temp >>= 1;
-                                                       diff >>= 1;
+               }
+       }
+       atomic_inc(&acb->rq_map_token);
+       if (readl(signature) == ARCMSR_SIGNATURE_GET_CONFIG) {
+               for (target = 0; target < ARCMSR_MAX_TARGETID - 1;
+                       target++) {
+                       temp = readb(devicemap);
+                       diff = (*acb_dev_map) ^ temp;
+                       if (diff != 0) {
+                               *acb_dev_map = temp;
+                               for (lun = 0; lun < ARCMSR_MAX_TARGETLUN;
+                                       lun++) {
+                                       if ((diff & 0x01) == 1 &&
+                                               (temp & 0x01) == 1) {
+                                               scsi_add_device(acb->host,
+                                                       0, target, lun);
+                                       } else if ((diff & 0x01) == 1
+                                               && (temp & 0x01) == 0) {
+                                               psdev =
+
scsi_device_lookup(acb->host,
+                                                       0, target, lun);
+                                               if (psdev != NULL) {
+
scsi_remove_device(psdev);
+                                                       scsi_device_put(psdev);
                                                }
                                        }
-                                       devicemap++;
-                                       acb_dev_map++;
+                                       temp >>= 1;
+                                       diff >>= 1;
                                }
                        }
+                       devicemap++;
+                       acb_dev_map++;
                }
        }
 }

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2014-02-21  4:07 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-02-21  4:07 [PATCH v1.3 6/11] arcmsr: Rewrite arcmsr_message_isr_bh_fn function 黃清隆

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.