tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

arcmsr: more readability improvements

Signed-off-by: Ching Huang <ching2048@areca.com.tw>
Reviewed-by: Tomas Henzl <thenzl@redhat.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

authored by

Ching Huang and committed by
Martin K. Petersen f75ab39a d15dd55d

+26 -47
+26 -47
drivers/scsi/arcmsr/arcmsr_hba.c
··· 2814 2814 acb->dma_coherent2 = dma_coherent2; 2815 2815 reg = (struct MessageUnit_D *)dma_coherent2; 2816 2816 acb->pmuD = reg; 2817 - reg->chip_id = acb->mem_base0 + ARCMSR_ARC1214_CHIP_ID; 2818 - reg->cpu_mem_config = acb->mem_base0 + 2819 - ARCMSR_ARC1214_CPU_MEMORY_CONFIGURATION; 2820 - reg->i2o_host_interrupt_mask = acb->mem_base0 + 2821 - ARCMSR_ARC1214_I2_HOST_INTERRUPT_MASK; 2822 - reg->sample_at_reset = acb->mem_base0 + ARCMSR_ARC1214_SAMPLE_RESET; 2823 - reg->reset_request = acb->mem_base0 + ARCMSR_ARC1214_RESET_REQUEST; 2824 - reg->host_int_status = acb->mem_base0 + 2825 - ARCMSR_ARC1214_MAIN_INTERRUPT_STATUS; 2826 - reg->pcief0_int_enable = acb->mem_base0 + 2827 - ARCMSR_ARC1214_PCIE_F0_INTERRUPT_ENABLE; 2828 - reg->inbound_msgaddr0 = acb->mem_base0 + 2829 - ARCMSR_ARC1214_INBOUND_MESSAGE0; 2830 - reg->inbound_msgaddr1 = acb->mem_base0 + 2831 - ARCMSR_ARC1214_INBOUND_MESSAGE1; 2832 - reg->outbound_msgaddr0 = acb->mem_base0 + 2833 - ARCMSR_ARC1214_OUTBOUND_MESSAGE0; 2834 - reg->outbound_msgaddr1 = acb->mem_base0 + 2835 - ARCMSR_ARC1214_OUTBOUND_MESSAGE1; 2836 - reg->inbound_doorbell = acb->mem_base0 + 2837 - ARCMSR_ARC1214_INBOUND_DOORBELL; 2838 - reg->outbound_doorbell = acb->mem_base0 + 2839 - ARCMSR_ARC1214_OUTBOUND_DOORBELL; 2840 - reg->outbound_doorbell_enable = acb->mem_base0 + 2841 - ARCMSR_ARC1214_OUTBOUND_DOORBELL_ENABLE; 2842 - reg->inboundlist_base_low = acb->mem_base0 + 2843 - ARCMSR_ARC1214_INBOUND_LIST_BASE_LOW; 2844 - reg->inboundlist_base_high = acb->mem_base0 + 2845 - ARCMSR_ARC1214_INBOUND_LIST_BASE_HIGH; 2846 - reg->inboundlist_write_pointer = acb->mem_base0 + 2847 - ARCMSR_ARC1214_INBOUND_LIST_WRITE_POINTER; 2848 - reg->outboundlist_base_low = acb->mem_base0 + 2849 - ARCMSR_ARC1214_OUTBOUND_LIST_BASE_LOW; 2850 - reg->outboundlist_base_high = acb->mem_base0 + 2851 - ARCMSR_ARC1214_OUTBOUND_LIST_BASE_HIGH; 2852 - reg->outboundlist_copy_pointer = acb->mem_base0 + 2853 - ARCMSR_ARC1214_OUTBOUND_LIST_COPY_POINTER; 2854 - reg->outboundlist_read_pointer = acb->mem_base0 + 2855 - ARCMSR_ARC1214_OUTBOUND_LIST_READ_POINTER; 2856 - reg->outboundlist_interrupt_cause = acb->mem_base0 + 2857 - ARCMSR_ARC1214_OUTBOUND_INTERRUPT_CAUSE; 2858 - reg->outboundlist_interrupt_enable = acb->mem_base0 + 2859 - ARCMSR_ARC1214_OUTBOUND_INTERRUPT_ENABLE; 2860 - reg->message_wbuffer = acb->mem_base0 + ARCMSR_ARC1214_MESSAGE_WBUFFER; 2861 - reg->message_rbuffer = acb->mem_base0 + ARCMSR_ARC1214_MESSAGE_RBUFFER; 2862 - reg->msgcode_rwbuffer = acb->mem_base0 + 2863 - ARCMSR_ARC1214_MESSAGE_RWBUFFER; 2817 + reg->chip_id = MEM_BASE0(ARCMSR_ARC1214_CHIP_ID); 2818 + reg->cpu_mem_config = MEM_BASE0(ARCMSR_ARC1214_CPU_MEMORY_CONFIGURATION); 2819 + reg->i2o_host_interrupt_mask = MEM_BASE0(ARCMSR_ARC1214_I2_HOST_INTERRUPT_MASK); 2820 + reg->sample_at_reset = MEM_BASE0(ARCMSR_ARC1214_SAMPLE_RESET); 2821 + reg->reset_request = MEM_BASE0(ARCMSR_ARC1214_RESET_REQUEST); 2822 + reg->host_int_status = MEM_BASE0(ARCMSR_ARC1214_MAIN_INTERRUPT_STATUS); 2823 + reg->pcief0_int_enable = MEM_BASE0(ARCMSR_ARC1214_PCIE_F0_INTERRUPT_ENABLE); 2824 + reg->inbound_msgaddr0 = MEM_BASE0(ARCMSR_ARC1214_INBOUND_MESSAGE0); 2825 + reg->inbound_msgaddr1 = MEM_BASE0(ARCMSR_ARC1214_INBOUND_MESSAGE1); 2826 + reg->outbound_msgaddr0 = MEM_BASE0(ARCMSR_ARC1214_OUTBOUND_MESSAGE0); 2827 + reg->outbound_msgaddr1 = MEM_BASE0(ARCMSR_ARC1214_OUTBOUND_MESSAGE1); 2828 + reg->inbound_doorbell = MEM_BASE0(ARCMSR_ARC1214_INBOUND_DOORBELL); 2829 + reg->outbound_doorbell = MEM_BASE0(ARCMSR_ARC1214_OUTBOUND_DOORBELL); 2830 + reg->outbound_doorbell_enable = MEM_BASE0(ARCMSR_ARC1214_OUTBOUND_DOORBELL_ENABLE); 2831 + reg->inboundlist_base_low = MEM_BASE0(ARCMSR_ARC1214_INBOUND_LIST_BASE_LOW); 2832 + reg->inboundlist_base_high = MEM_BASE0(ARCMSR_ARC1214_INBOUND_LIST_BASE_HIGH); 2833 + reg->inboundlist_write_pointer = MEM_BASE0(ARCMSR_ARC1214_INBOUND_LIST_WRITE_POINTER); 2834 + reg->outboundlist_base_low = MEM_BASE0(ARCMSR_ARC1214_OUTBOUND_LIST_BASE_LOW); 2835 + reg->outboundlist_base_high = MEM_BASE0(ARCMSR_ARC1214_OUTBOUND_LIST_BASE_HIGH); 2836 + reg->outboundlist_copy_pointer = MEM_BASE0(ARCMSR_ARC1214_OUTBOUND_LIST_COPY_POINTER); 2837 + reg->outboundlist_read_pointer = MEM_BASE0(ARCMSR_ARC1214_OUTBOUND_LIST_READ_POINTER); 2838 + reg->outboundlist_interrupt_cause = MEM_BASE0(ARCMSR_ARC1214_OUTBOUND_INTERRUPT_CAUSE); 2839 + reg->outboundlist_interrupt_enable = MEM_BASE0(ARCMSR_ARC1214_OUTBOUND_INTERRUPT_ENABLE); 2840 + reg->message_wbuffer = MEM_BASE0(ARCMSR_ARC1214_MESSAGE_WBUFFER); 2841 + reg->message_rbuffer = MEM_BASE0(ARCMSR_ARC1214_MESSAGE_RBUFFER); 2842 + reg->msgcode_rwbuffer = MEM_BASE0(ARCMSR_ARC1214_MESSAGE_RWBUFFER); 2864 2843 iop_firm_model = (char __iomem *)(&reg->msgcode_rwbuffer[15]); 2865 2844 iop_firm_version = (char __iomem *)(&reg->msgcode_rwbuffer[17]); 2866 2845 iop_device_map = (char __iomem *)(&reg->msgcode_rwbuffer[21]);