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

[SCSI] mvme147: Reindentation

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>

authored by

Geert Uytterhoeven and committed by
James Bottomley
be4540db bb17b787

+77 -73
+75 -71
drivers/scsi/mvme147.c
··· 13 13 #include "wd33c93.h" 14 14 #include "mvme147.h" 15 15 16 - #include<linux/stat.h> 16 + #include <linux/stat.h> 17 17 18 - #define HDATA(ptr) ((struct WD33C93_hostdata *)((ptr)->hostdata)) 18 + 19 + #define HDATA(ptr) ((struct WD33C93_hostdata *)((ptr)->hostdata)) 19 20 20 21 static struct Scsi_Host *mvme147_host = NULL; 21 22 22 - static irqreturn_t mvme147_intr (int irq, void *dummy) 23 + static irqreturn_t mvme147_intr(int irq, void *dummy) 23 24 { 24 - if (irq == MVME147_IRQ_SCSI_PORT) 25 - wd33c93_intr (mvme147_host); 26 - else 27 - m147_pcc->dma_intr = 0x89; /* Ack and enable ints */ 28 - return IRQ_HANDLED; 25 + if (irq == MVME147_IRQ_SCSI_PORT) 26 + wd33c93_intr(mvme147_host); 27 + else 28 + m147_pcc->dma_intr = 0x89; /* Ack and enable ints */ 29 + return IRQ_HANDLED; 29 30 } 30 31 31 32 static int dma_setup(struct scsi_cmnd *cmd, int dir_in) 32 33 { 33 - unsigned char flags = 0x01; 34 - unsigned long addr = virt_to_bus(cmd->SCp.ptr); 34 + unsigned char flags = 0x01; 35 + unsigned long addr = virt_to_bus(cmd->SCp.ptr); 35 36 36 - /* setup dma direction */ 37 - if (!dir_in) 38 - flags |= 0x04; 37 + /* setup dma direction */ 38 + if (!dir_in) 39 + flags |= 0x04; 39 40 40 - /* remember direction */ 41 - HDATA(mvme147_host)->dma_dir = dir_in; 41 + /* remember direction */ 42 + HDATA(mvme147_host)->dma_dir = dir_in; 42 43 43 - if (dir_in) 44 - /* invalidate any cache */ 45 - cache_clear (addr, cmd->SCp.this_residual); 46 - else 47 - /* push any dirty cache */ 48 - cache_push (addr, cmd->SCp.this_residual); 44 + if (dir_in) { 45 + /* invalidate any cache */ 46 + cache_clear(addr, cmd->SCp.this_residual); 47 + } else { 48 + /* push any dirty cache */ 49 + cache_push(addr, cmd->SCp.this_residual); 50 + } 49 51 50 - /* start DMA */ 51 - m147_pcc->dma_bcr = cmd->SCp.this_residual | (1<<24); 52 - m147_pcc->dma_dadr = addr; 53 - m147_pcc->dma_cntrl = flags; 52 + /* start DMA */ 53 + m147_pcc->dma_bcr = cmd->SCp.this_residual | (1 << 24); 54 + m147_pcc->dma_dadr = addr; 55 + m147_pcc->dma_cntrl = flags; 54 56 55 - /* return success */ 56 - return 0; 57 + /* return success */ 58 + return 0; 57 59 } 58 60 59 61 static void dma_stop(struct Scsi_Host *instance, struct scsi_cmnd *SCpnt, 60 - int status) 62 + int status) 61 63 { 62 - m147_pcc->dma_cntrl = 0; 64 + m147_pcc->dma_cntrl = 0; 63 65 } 64 66 65 67 int mvme147_detect(struct scsi_host_template *tpnt) 66 68 { 67 - static unsigned char called = 0; 68 - wd33c93_regs regs; 69 + static unsigned char called = 0; 70 + wd33c93_regs regs; 69 71 70 - if (!MACH_IS_MVME147 || called) 71 - return 0; 72 - called++; 72 + if (!MACH_IS_MVME147 || called) 73 + return 0; 74 + called++; 73 75 74 - tpnt->proc_name = "MVME147"; 75 - tpnt->proc_info = &wd33c93_proc_info; 76 + tpnt->proc_name = "MVME147"; 77 + tpnt->proc_info = &wd33c93_proc_info; 76 78 77 - mvme147_host = scsi_register (tpnt, sizeof(struct WD33C93_hostdata)); 78 - if (!mvme147_host) 79 - goto err_out; 79 + mvme147_host = scsi_register(tpnt, sizeof(struct WD33C93_hostdata)); 80 + if (!mvme147_host) 81 + goto err_out; 80 82 81 - mvme147_host->base = 0xfffe4000; 82 - mvme147_host->irq = MVME147_IRQ_SCSI_PORT; 83 - regs.SASR = (volatile unsigned char *)0xfffe4000; 84 - regs.SCMD = (volatile unsigned char *)0xfffe4001; 85 - HDATA(mvme147_host)->no_sync = 0xff; 86 - HDATA(mvme147_host)->fast = 0; 87 - HDATA(mvme147_host)->dma_mode = CTRL_DMA; 88 - wd33c93_init(mvme147_host, regs, dma_setup, dma_stop, WD33C93_FS_8_10); 83 + mvme147_host->base = 0xfffe4000; 84 + mvme147_host->irq = MVME147_IRQ_SCSI_PORT; 85 + regs.SASR = (volatile unsigned char *)0xfffe4000; 86 + regs.SCMD = (volatile unsigned char *)0xfffe4001; 87 + HDATA(mvme147_host)->no_sync = 0xff; 88 + HDATA(mvme147_host)->fast = 0; 89 + HDATA(mvme147_host)->dma_mode = CTRL_DMA; 90 + wd33c93_init(mvme147_host, regs, dma_setup, dma_stop, WD33C93_FS_8_10); 89 91 90 - if (request_irq(MVME147_IRQ_SCSI_PORT, mvme147_intr, 0, "MVME147 SCSI PORT", mvme147_intr)) 91 - goto err_unregister; 92 - if (request_irq(MVME147_IRQ_SCSI_DMA, mvme147_intr, 0, "MVME147 SCSI DMA", mvme147_intr)) 93 - goto err_free_irq; 92 + if (request_irq(MVME147_IRQ_SCSI_PORT, mvme147_intr, 0, 93 + "MVME147 SCSI PORT", mvme147_intr)) 94 + goto err_unregister; 95 + if (request_irq(MVME147_IRQ_SCSI_DMA, mvme147_intr, 0, 96 + "MVME147 SCSI DMA", mvme147_intr)) 97 + goto err_free_irq; 94 98 #if 0 /* Disabled; causes problems booting */ 95 - m147_pcc->scsi_interrupt = 0x10; /* Assert SCSI bus reset */ 96 - udelay(100); 97 - m147_pcc->scsi_interrupt = 0x00; /* Negate SCSI bus reset */ 98 - udelay(2000); 99 - m147_pcc->scsi_interrupt = 0x40; /* Clear bus reset interrupt */ 99 + m147_pcc->scsi_interrupt = 0x10; /* Assert SCSI bus reset */ 100 + udelay(100); 101 + m147_pcc->scsi_interrupt = 0x00; /* Negate SCSI bus reset */ 102 + udelay(2000); 103 + m147_pcc->scsi_interrupt = 0x40; /* Clear bus reset interrupt */ 100 104 #endif 101 - m147_pcc->scsi_interrupt = 0x09; /* Enable interrupt */ 105 + m147_pcc->scsi_interrupt = 0x09; /* Enable interrupt */ 102 106 103 - m147_pcc->dma_cntrl = 0x00; /* ensure DMA is stopped */ 104 - m147_pcc->dma_intr = 0x89; /* Ack and enable ints */ 107 + m147_pcc->dma_cntrl = 0x00; /* ensure DMA is stopped */ 108 + m147_pcc->dma_intr = 0x89; /* Ack and enable ints */ 105 109 106 - return 1; 110 + return 1; 107 111 108 - err_free_irq: 109 - free_irq(MVME147_IRQ_SCSI_PORT, mvme147_intr); 110 - err_unregister: 111 - scsi_unregister(mvme147_host); 112 - err_out: 113 - return 0; 112 + err_free_irq: 113 + free_irq(MVME147_IRQ_SCSI_PORT, mvme147_intr); 114 + err_unregister: 115 + scsi_unregister(mvme147_host); 116 + err_out: 117 + return 0; 114 118 } 115 119 116 120 static int mvme147_bus_reset(struct scsi_cmnd *cmd) 117 121 { 118 122 /* FIXME perform bus-specific reset */ 119 123 120 - /* FIXME 2: kill this function, and let midlayer fallback to 124 + /* FIXME 2: kill this function, and let midlayer fallback to 121 125 the same result, calling wd33c93_host_reset() */ 122 126 123 127 spin_lock_irq(cmd->device->host->host_lock); ··· 157 153 int mvme147_release(struct Scsi_Host *instance) 158 154 { 159 155 #ifdef MODULE 160 - /* XXX Make sure DMA is stopped! */ 161 - free_irq(MVME147_IRQ_SCSI_PORT, mvme147_intr); 162 - free_irq(MVME147_IRQ_SCSI_DMA, mvme147_intr); 156 + /* XXX Make sure DMA is stopped! */ 157 + free_irq(MVME147_IRQ_SCSI_PORT, mvme147_intr); 158 + free_irq(MVME147_IRQ_SCSI_DMA, mvme147_intr); 163 159 #endif 164 - return 1; 160 + return 1; 165 161 }
+2 -2
drivers/scsi/mvme147.h
··· 14 14 int mvme147_release(struct Scsi_Host *); 15 15 16 16 #ifndef CMD_PER_LUN 17 - #define CMD_PER_LUN 2 17 + #define CMD_PER_LUN 2 18 18 #endif 19 19 20 20 #ifndef CAN_QUEUE 21 - #define CAN_QUEUE 16 21 + #define CAN_QUEUE 16 22 22 #endif 23 23 24 24 #endif /* MVME147_H */