2021-05-22 08:43:43

by Hui Tang

[permalink] [raw]
Subject: [PATCH 00/24] scsi: remove leading spaces before tabs

There are a few leading spaces before tabs and remove it by running
the following commard:

$ find . -name '*.[ch]' | xargs sed -r -i 's/^[ ]+\t/\t/'

Hui Tang (24):
scsi: aacraid: remove leading spaces before tabs
scsi: aic7xxx: remove leading spaces before tabs
scsi: arm: remove leading spaces before tabs
scsi: sym53c8xx: remove leading spaces before tabs
scsi: qla2xxx: remove leading spaces before tabs
scsi: arcmsr: remove leading spaces before tabs
scsi: ibmvfc: remove leading spaces before tabs
scsi: megaraid: remove leading spaces before tabs
scsi: zalon: remove leading spaces before tabs
scsi: wd33c93: remove leading spaces before tabs
scsi: sun3_scsi: remove leading spaces before tabs
scsi: scsi_transport_spi: remove leading spaces before tabs
scsi: scsi_transport_fc: remove leading spaces before tabs
scsi: proc: remove leading spaces before tabs
scsi: qlogicfas408: remove leading spaces before tabs
scsi: qla1280: remove leading space before tabs
scsi: pcmcia: remove leading spaces before tabs
scsi: ncr53c8xx: remove leading spaces before tabs
scsi: mesh: remove leading spaces before tabs
scsi: mac53c94: remove leading spaces before tabs
scsi: ips: remove leading spaces before tabs
scsi: dpt_i2o: remove leading spaces before tabs
scsi: dc395x: remove leading spaces before tabs
scsi: aha1740: remove leading spaces before tabs

drivers/scsi/aacraid/sa.c | 2 +-
drivers/scsi/aha1740.c | 2 +-
drivers/scsi/aic7xxx/aic7770_osm.c | 2 +-
drivers/scsi/aic7xxx/aic7xxx_osm_pci.c | 14 ++++-----
drivers/scsi/aic7xxx/aic7xxx_pci.c | 2 +-
drivers/scsi/arcmsr/arcmsr_hba.c | 2 +-
drivers/scsi/arm/fas216.c | 2 +-
drivers/scsi/arm/fas216.h | 2 +-
drivers/scsi/dc395x.c | 22 +++++++-------
drivers/scsi/dpt_i2o.c | 4 +--
drivers/scsi/ibmvscsi/ibmvscsi.c | 4 +--
drivers/scsi/ips.c | 4 +--
drivers/scsi/mac53c94.c | 24 +++++++--------
drivers/scsi/megaraid/mega_common.h | 2 +-
drivers/scsi/mesh.c | 54 +++++++++++++++++-----------------
drivers/scsi/ncr53c8xx.c | 32 ++++++++++----------
drivers/scsi/ncr53c8xx.h | 2 +-
drivers/scsi/pcmcia/nsp_cs.c | 2 +-
drivers/scsi/qla1280.c | 4 +--
drivers/scsi/qla2xxx/qla_dbg.c | 4 +--
drivers/scsi/qla2xxx/qla_mbx.c | 32 ++++++++++----------
drivers/scsi/qlogicfas408.c | 4 +--
drivers/scsi/scsi_proc.c | 2 +-
drivers/scsi/scsi_transport_fc.c | 2 +-
drivers/scsi/scsi_transport_spi.c | 4 +--
drivers/scsi/sun3_scsi.c | 2 +-
drivers/scsi/sym53c8xx_2/sym_defs.h | 2 +-
drivers/scsi/sym53c8xx_2/sym_hipd.c | 40 ++++++++++++-------------
drivers/scsi/wd33c93.c | 4 +--
drivers/scsi/zalon.c | 2 +-
30 files changed, 140 insertions(+), 140 deletions(-)

--
2.8.1


2021-05-22 08:43:43

by Hui Tang

[permalink] [raw]
Subject: [PATCH 01/24] scsi: aacraid: remove leading spaces before tabs

There are a few leading spaces before tabs and remove it by running the
following commard:

$ find . -name '*.[ch]' | xargs sed -r -i 's/^[ ]+\t/\t/'

Cc: Adaptec OEM Raid Solutions <[email protected]>
Signed-off-by: Hui Tang <[email protected]>
---
drivers/scsi/aacraid/sa.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/scsi/aacraid/sa.c b/drivers/scsi/aacraid/sa.c
index c9a1dad..8cf66a36 100644
--- a/drivers/scsi/aacraid/sa.c
+++ b/drivers/scsi/aacraid/sa.c
@@ -154,7 +154,7 @@ static int sa_sync_cmd(struct aac_dev *dev, u32 command,
u32 *ret, u32 *r1, u32 *r2, u32 *r3, u32 *r4)
{
unsigned long start;
- int ok;
+ int ok;
/*
* Write the Command into Mailbox 0
*/
--
2.8.1

2021-05-22 08:43:43

by Hui Tang

[permalink] [raw]
Subject: [PATCH 06/24] scsi: arcmsr: remove leading spaces before tabs

There are a few leading spaces before tabs and remove it by running
the following commard:

$ find . -name '*.[ch]' | xargs sed -r -i 's/^[ ]+\t/\t/'

Cc: ching Huang <[email protected]>
Signed-off-by: Hui Tang <[email protected]>
---
drivers/scsi/arcmsr/arcmsr_hba.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/scsi/arcmsr/arcmsr_hba.c b/drivers/scsi/arcmsr/arcmsr_hba.c
index 930972c..b9a6883 100644
--- a/drivers/scsi/arcmsr/arcmsr_hba.c
+++ b/drivers/scsi/arcmsr/arcmsr_hba.c
@@ -1026,7 +1026,7 @@ static int arcmsr_probe(struct pci_dev *pdev, const struct pci_device_id *id)
}
host = scsi_host_alloc(&arcmsr_scsi_host_template, sizeof(struct AdapterControlBlock));
if(!host){
- goto pci_disable_dev;
+ goto pci_disable_dev;
}
init_waitqueue_head(&wait_q);
bus = pdev->bus->number;
--
2.8.1

2021-05-22 08:43:43

by Hui Tang

[permalink] [raw]
Subject: [PATCH 16/24] scsi: qla1280: remove leading space before tabs

There are a few leading spaces before tabs and remove it by running
the following commard:

$ find . -name '*.[ch]' | xargs sed -r -i 's/^[ ]+\t/\t/'

Cc: Michael Reed <[email protected]>
Signed-off-by: Hui Tang <[email protected]>
---
drivers/scsi/qla1280.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/scsi/qla1280.c b/drivers/scsi/qla1280.c
index 928da90..54cbfda 100644
--- a/drivers/scsi/qla1280.c
+++ b/drivers/scsi/qla1280.c
@@ -38,7 +38,7 @@
- Initialize completion queue to avoid OOPS on probe
- Handle interrupts during mailbox testing
Rev 3.24 November 17, 2003, Christoph Hellwig
- - use struct list_head for completion queue
+ - use struct list_head for completion queue
- avoid old Scsi_FOO typedefs
- cleanup 2.4 compat glue a bit
- use <scsi/scsi_*.h> headers on 2.6 instead of "scsi.h"
@@ -4058,7 +4058,7 @@ qla1280_setup(char *s)
val = 0x10000;
ptr += 3;
} else if (!strcmp(ptr, "no")) {
- val = 0;
+ val = 0;
ptr += 2;
} else
val = simple_strtoul(ptr, &ptr, 0);
--
2.8.1

2021-05-22 08:43:43

by Hui Tang

[permalink] [raw]
Subject: [PATCH 02/24] scsi: aic7xxx: remove leading spaces before tabs

There are a few leading spaces before tabs and remove it by running
the following commard:

$ find . -name '*.[ch]' | xargs sed -r -i 's/^[ ]+\t/\t/'

Cc: Hannes Reinecke <[email protected]>
Signed-off-by: Hui Tang <[email protected]>
---
drivers/scsi/aic7xxx/aic7770_osm.c | 2 +-
drivers/scsi/aic7xxx/aic7xxx_osm_pci.c | 14 +++++++-------
drivers/scsi/aic7xxx/aic7xxx_pci.c | 2 +-
3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/drivers/scsi/aic7xxx/aic7770_osm.c b/drivers/scsi/aic7xxx/aic7770_osm.c
index bdd177e..ac04d5b 100644
--- a/drivers/scsi/aic7xxx/aic7770_osm.c
+++ b/drivers/scsi/aic7xxx/aic7770_osm.c
@@ -100,7 +100,7 @@ aic7770_probe(struct device *dev)
return (error);
}

- dev_set_drvdata(dev, ahc);
+ dev_set_drvdata(dev, ahc);

error = ahc_linux_register_host(ahc, &aic7xxx_driver_template);
return (error);
diff --git a/drivers/scsi/aic7xxx/aic7xxx_osm_pci.c b/drivers/scsi/aic7xxx/aic7xxx_osm_pci.c
index a07e94f..5e5d456 100644
--- a/drivers/scsi/aic7xxx/aic7xxx_osm_pci.c
+++ b/drivers/scsi/aic7xxx/aic7xxx_osm_pci.c
@@ -109,8 +109,8 @@ static const struct pci_device_id ahc_linux_pci_id_table[] = {
ID(ID_AIC7860 & ID_DEV_VENDOR_MASK),
ID(ID_AIC7870 & ID_DEV_VENDOR_MASK),
ID(ID_AIC7880 & ID_DEV_VENDOR_MASK),
- ID16(ID_AIC7890 & ID_9005_GENERIC_MASK),
- ID16(ID_AIC7892 & ID_9005_GENERIC_MASK),
+ ID16(ID_AIC7890 & ID_9005_GENERIC_MASK),
+ ID16(ID_AIC7892 & ID_9005_GENERIC_MASK),
ID(ID_AIC7895 & ID_DEV_VENDOR_MASK),
ID16(ID_AIC7896 & ID_9005_GENERIC_MASK),
ID16(ID_AIC7899 & ID_9005_GENERIC_MASK),
@@ -164,15 +164,15 @@ ahc_linux_pci_inherit_flags(struct ahc_softc *ahc)
if (master_pdev) {
struct ahc_softc *master = pci_get_drvdata(master_pdev);
if (master) {
- ahc->flags &= ~AHC_BIOS_ENABLED;
+ ahc->flags &= ~AHC_BIOS_ENABLED;
ahc->flags |= master->flags & AHC_BIOS_ENABLED;

- ahc->flags &= ~AHC_PRIMARY_CHANNEL;
+ ahc->flags &= ~AHC_PRIMARY_CHANNEL;
ahc->flags |= master->flags & AHC_PRIMARY_CHANNEL;
} else
printk(KERN_ERR "aic7xxx: no multichannel peer found!\n");
pci_dev_put(master_pdev);
- }
+ }
}

static int
@@ -222,7 +222,7 @@ ahc_linux_pci_dev_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
if (dma_set_mask(dev, DMA_BIT_MASK(32))) {
ahc_free(ahc);
printk(KERN_WARNING "aic7xxx: No suitable DMA available.\n");
- return (-ENODEV);
+ return (-ENODEV);
}
}
ahc->dev_softc = pci;
@@ -441,7 +441,7 @@ ahc_pci_map_int(struct ahc_softc *ahc)
IRQF_SHARED, "aic7xxx", ahc);
if (error == 0)
ahc->platform_data->irq = ahc->dev_softc->irq;
-
+
return (-error);
}

diff --git a/drivers/scsi/aic7xxx/aic7xxx_pci.c b/drivers/scsi/aic7xxx/aic7xxx_pci.c
index dab3a6d..4a63e37 100644
--- a/drivers/scsi/aic7xxx/aic7xxx_pci.c
+++ b/drivers/scsi/aic7xxx/aic7xxx_pci.c
@@ -898,7 +898,7 @@ ahc_pci_config(struct ahc_softc *ahc, const struct ahc_pci_identity *entry)
* Assume only one connector and always turn
* on termination.
*/
- our_id = 0x07;
+ our_id = 0x07;
sxfrctl1 = STPWEN;
}
ahc_outb(ahc, SCSICONF, our_id|ENSPCHK|RESET_SCSI);
--
2.8.1

2021-05-22 08:43:43

by Hui Tang

[permalink] [raw]
Subject: [PATCH 03/24] scsi: arm: remove leading spaces before tabs

There are a few leading spaces before tabs and remove it by running
the following commard:

$ find . -name '*.[ch]' | xargs sed -r -i 's/^[ ]+\t/\t/'

Cc: Russell King <[email protected]>
Signed-off-by: Hui Tang <[email protected]>
---
drivers/scsi/arm/fas216.c | 2 +-
drivers/scsi/arm/fas216.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/scsi/arm/fas216.c b/drivers/scsi/arm/fas216.c
index 2e687ce..3f4a710 100644
--- a/drivers/scsi/arm/fas216.c
+++ b/drivers/scsi/arm/fas216.c
@@ -2149,7 +2149,7 @@ static void fas216_done(FAS216_Info *info, unsigned int result)

SCpnt = info->SCpnt;
info->SCpnt = NULL;
- info->scsi.phase = PHASE_IDLE;
+ info->scsi.phase = PHASE_IDLE;

if (info->scsi.aborting) {
fas216_log(info, 0, "uncaught abort - returning DID_ABORT");
diff --git a/drivers/scsi/arm/fas216.h b/drivers/scsi/arm/fas216.h
index 847413c..93ae0ad 100644
--- a/drivers/scsi/arm/fas216.h
+++ b/drivers/scsi/arm/fas216.h
@@ -279,7 +279,7 @@ typedef struct {
/* queue handling */
struct {
Queue_t issue; /* issue queue */
- Queue_t disconnected; /* disconnected command queue */
+ Queue_t disconnected; /* disconnected command queue */
} queues;

/* per-device info */
--
2.8.1

2021-05-22 08:43:43

by Hui Tang

[permalink] [raw]
Subject: [PATCH 04/24] scsi: sym53c8xx: remove leading spaces before tabs

There are a few leading spaces before tabs and remove it by running
the following commard:

$ find . -name '*.[ch]' | xargs sed -r -i 's/^[ ]+\t/\t/'

Cc: Matthew Wilcox <[email protected]>
Signed-off-by: Hui Tang <[email protected]>
---
drivers/scsi/sym53c8xx_2/sym_defs.h | 2 +-
drivers/scsi/sym53c8xx_2/sym_hipd.c | 40 ++++++++++++++++++-------------------
2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/drivers/scsi/sym53c8xx_2/sym_defs.h b/drivers/scsi/sym53c8xx_2/sym_defs.h
index 317289e..2d848615 100644
--- a/drivers/scsi/sym53c8xx_2/sym_defs.h
+++ b/drivers/scsi/sym53c8xx_2/sym_defs.h
@@ -234,7 +234,7 @@ struct sym_reg {
#define IRQM 0x08 /* mod: irq mode (1 = totem pole !) */
#define STD 0x04 /* cmd: start dma mode */
#define IRQD 0x02 /* mod: irq disable */
- #define NOCOM 0x01 /* cmd: protect sfbr while reselect */
+ #define NOCOM 0x01 /* cmd: protect sfbr while reselect */
/* bits 0-1 rsvd for C1010 */

/*3c*/ u32 nc_adder;
diff --git a/drivers/scsi/sym53c8xx_2/sym_hipd.c b/drivers/scsi/sym53c8xx_2/sym_hipd.c
index 255a2d4..4c5e68c 100644
--- a/drivers/scsi/sym53c8xx_2/sym_hipd.c
+++ b/drivers/scsi/sym53c8xx_2/sym_hipd.c
@@ -332,16 +332,16 @@ static unsigned getfreq (struct sym_hcb *np, int gen)
OUTW(np, nc_sien, 0);
OUTB(np, nc_istat1, 0);
}
- /*
- * set prescaler to divide by whatever 0 means
- * 0 ought to choose divide by 2, but appears
- * to set divide by 3.5 mode in my 53c810 ...
- */
- OUTB(np, nc_scntl3, 0);
-
- /*
- * adjust for prescaler, and convert into KHz
- */
+ /*
+ * set prescaler to divide by whatever 0 means
+ * 0 ought to choose divide by 2, but appears
+ * to set divide by 3.5 mode in my 53c810 ...
+ */
+ OUTB(np, nc_scntl3, 0);
+
+ /*
+ * adjust for prescaler, and convert into KHz
+ */
f = ms ? ((1 << gen) * (4340*4)) / ms : 0;

/*
@@ -688,7 +688,7 @@ static int sym_prepare_setting(struct Scsi_Host *shost, struct sym_hcb *np, stru

/*
* Get the clock multiplier factor.
- */
+ */
if (np->features & FE_QUAD)
np->multiplier = 4;
else if (np->features & FE_DBLR)
@@ -774,11 +774,11 @@ static int sym_prepare_setting(struct Scsi_Host *shost, struct sym_hcb *np, stru

/*
* Phase mismatch handled by SCRIPTS (895A/896/1010) ?
- */
+ */
if (np->features & FE_NOPM)
np->rv_ccntl0 |= (ENPMJ);

- /*
+ /*
* C1010-33 Errata: Part Number:609-039638 (rev. 1) is fixed.
* In dual channel mode, contention occurs if internal cycles
* are used. Disable internal cycles.
@@ -1692,12 +1692,12 @@ void sym_start_up(struct Scsi_Host *shost, int reason)
struct sym_data *sym_data = shost_priv(shost);
struct pci_dev *pdev = sym_data->pdev;
struct sym_hcb *np = sym_data->ncb;
- int i;
+ int i;
u32 phys;

- /*
+ /*
* Reset chip if asked, otherwise just clear fifos.
- */
+ */
if (reason == 1)
sym_soft_reset(np);
else {
@@ -3080,7 +3080,7 @@ static void sym_sir_bad_scsi_status(struct sym_hcb *np, int num, struct sym_ccb
sym_dequeue_from_squeue(np, i, cp->target, cp->lun, -1);
OUTL_DSP(np, SCRIPTA_BA(np, start));

- /*
+ /*
* Save some info of the actual IO.
* Compute the data residual.
*/
@@ -3573,9 +3573,9 @@ static void sym_sir_task_recovery(struct sym_hcb *np, int num)
sym_clear_tasks(np, DID_ABORT, target, lun, task);
sym_flush_comp_queue(np, 0);

- /*
+ /*
* If we sent a BDR, make upper layer aware of that.
- */
+ */
if (np->abrt_msg[0] == M_RESET)
starget_printk(KERN_NOTICE, starget,
"has been reset\n");
@@ -4902,7 +4902,7 @@ static struct sym_ccb *sym_alloc_ccb(struct sym_hcb *np)
cp->phys.head.go.start = cpu_to_scr(SCRIPTA_BA(np, idle));
cp->phys.head.go.restart = cpu_to_scr(SCRIPTB_BA(np, bad_i_t_l));

- /*
+ /*
* Initilialyze some other fields.
*/
cp->phys.smsg_ext.addr = cpu_to_scr(HCB_BA(np, msgin[2]));
--
2.8.1

2021-05-22 08:43:43

by Hui Tang

[permalink] [raw]
Subject: [PATCH 05/24] scsi: qla2xxx: remove leading spaces before tabs

There are a few leading spaces before tabs and remove it by running
the following commard:

$ find . -name '*.[ch]' | xargs sed -r -i 's/^[ ]+\t/\t/'

Cc: Nilesh Javali <[email protected]>
Signed-off-by: Hui Tang <[email protected]>
---
drivers/scsi/qla2xxx/qla_dbg.c | 4 ++--
drivers/scsi/qla2xxx/qla_mbx.c | 32 ++++++++++++++++----------------
2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/drivers/scsi/qla2xxx/qla_dbg.c b/drivers/scsi/qla2xxx/qla_dbg.c
index f2d0559..03c248a 100644
--- a/drivers/scsi/qla2xxx/qla_dbg.c
+++ b/drivers/scsi/qla2xxx/qla_dbg.c
@@ -1032,12 +1032,12 @@ qla2100_fw_dump(scsi_qla_host_t *vha)
if (rval == QLA_SUCCESS) {
/* Get RISC SRAM. */
risc_address = 0x1000;
- WRT_MAILBOX_REG(ha, reg, 0, MBC_READ_RAM_WORD);
+ WRT_MAILBOX_REG(ha, reg, 0, MBC_READ_RAM_WORD);
clear_bit(MBX_INTERRUPT, &ha->mbx_cmd_flags);
}
for (cnt = 0; cnt < ARRAY_SIZE(fw->risc_ram) && rval == QLA_SUCCESS;
cnt++, risc_address++) {
- WRT_MAILBOX_REG(ha, reg, 1, risc_address);
+ WRT_MAILBOX_REG(ha, reg, 1, risc_address);
wrt_reg_word(&reg->hccr, HCCR_SET_HOST_INT);

for (timer = 6000000; timer != 0; timer--) {
diff --git a/drivers/scsi/qla2xxx/qla_mbx.c b/drivers/scsi/qla2xxx/qla_mbx.c
index 0bcd8af..1a7891c 100644
--- a/drivers/scsi/qla2xxx/qla_mbx.c
+++ b/drivers/scsi/qla2xxx/qla_mbx.c
@@ -2708,28 +2708,28 @@ qla2x00_login_local_device(scsi_qla_host_t *vha, fc_port_t *fcport,
mcp->mb[1] = fcport->loop_id << 8;
mcp->mb[2] = opt;
mcp->out_mb = MBX_2|MBX_1|MBX_0;
- mcp->in_mb = MBX_7|MBX_6|MBX_1|MBX_0;
+ mcp->in_mb = MBX_7|MBX_6|MBX_1|MBX_0;
mcp->tov = (ha->login_timeout * 2) + (ha->login_timeout / 2);
mcp->flags = 0;
rval = qla2x00_mailbox_command(vha, mcp);

- /* Return mailbox statuses. */
- if (mb_ret != NULL) {
- mb_ret[0] = mcp->mb[0];
- mb_ret[1] = mcp->mb[1];
- mb_ret[6] = mcp->mb[6];
- mb_ret[7] = mcp->mb[7];
- }
+ /* Return mailbox statuses. */
+ if (mb_ret != NULL) {
+ mb_ret[0] = mcp->mb[0];
+ mb_ret[1] = mcp->mb[1];
+ mb_ret[6] = mcp->mb[6];
+ mb_ret[7] = mcp->mb[7];
+ }

if (rval != QLA_SUCCESS) {
- /* AV tmp code: need to change main mailbox_command function to
- * return ok even when the mailbox completion value is not
- * SUCCESS. The caller needs to be responsible to interpret
- * the return values of this mailbox command if we're not
- * to change too much of the existing code.
- */
- if (mcp->mb[0] == 0x4005 || mcp->mb[0] == 0x4006)
- rval = QLA_SUCCESS;
+ /* AV tmp code: need to change main mailbox_command function to
+ * return ok even when the mailbox completion value is not
+ * SUCCESS. The caller needs to be responsible to interpret
+ * the return values of this mailbox command if we're not
+ * to change too much of the existing code.
+ */
+ if (mcp->mb[0] == 0x4005 || mcp->mb[0] == 0x4006)
+ rval = QLA_SUCCESS;

ql_dbg(ql_dbg_mbx, vha, 0x106b,
"Failed=%x mb[0]=%x mb[1]=%x mb[6]=%x mb[7]=%x.\n",
--
2.8.1

2021-05-22 08:43:43

by Hui Tang

[permalink] [raw]
Subject: [PATCH 18/24] scsi: ncr53c8xx: remove leading spaces before tabs

There are a few leading spaces before tabs and remove it by running
the following commard:

$ find . -name '*.[ch]' | xargs sed -r -i 's/^[ ]+\t/\t/'

Signed-off-by: Hui Tang <[email protected]>
---
drivers/scsi/ncr53c8xx.c | 32 ++++++++++++++++----------------
drivers/scsi/ncr53c8xx.h | 2 +-
2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/drivers/scsi/ncr53c8xx.c b/drivers/scsi/ncr53c8xx.c
index c76e9f0..0024bc5 100644
--- a/drivers/scsi/ncr53c8xx.c
+++ b/drivers/scsi/ncr53c8xx.c
@@ -2214,7 +2214,7 @@ static struct script script0 __initdata = {
RADDR (scratcha),
RADDR (scratcha),
SCR_RETURN,
- 0,
+ 0,
SCR_JUMP ^ IFTRUE (IF (SCR_STATUS)),
PADDR (status),
SCR_JUMP ^ IFTRUE (IF (SCR_COMMAND)),
@@ -3760,7 +3760,7 @@ static void __init ncr_prepare_setting(struct ncb *np)

np->maxwide = (np->features & FE_WIDE)? 1 : 0;

- /*
+ /*
* Guess the frequency of the chip's clock.
*/
if (np->features & FE_ULTRA)
@@ -3770,7 +3770,7 @@ static void __init ncr_prepare_setting(struct ncb *np)

/*
* Get the clock multiplier factor.
- */
+ */
if (np->features & FE_QUAD)
np->multiplier = 4;
else if (np->features & FE_DBLR)
@@ -4541,7 +4541,7 @@ static void ncr_start_reset(struct ncb *np)
{
if (!np->settle_time) {
ncr_reset_scsi_bus(np, 1, driver_setup.settle_delay);
- }
+ }
}

/*==========================================================
@@ -5204,11 +5204,11 @@ static void ncr_chip_reset(struct ncb *np, int delay)

void ncr_init (struct ncb *np, int reset, char * msg, u_long code)
{
- int i;
+ int i;

- /*
+ /*
** Reset chip if asked, otherwise just clear fifos.
- */
+ */

if (reset) {
OUTB (nc_istat, SRST);
@@ -7880,18 +7880,18 @@ static unsigned __init ncrgetfreq (struct ncb *np, int gen)
udelay(100); /* count ms */
}
OUTB (nc_stime1, 0); /* disable general purpose timer */
- /*
- * set prescaler to divide by whatever 0 means
- * 0 ought to choose divide by 2, but appears
- * to set divide by 3.5 mode in my 53c810 ...
- */
- OUTB (nc_scntl3, 0);
+ /*
+ * set prescaler to divide by whatever 0 means
+ * 0 ought to choose divide by 2, but appears
+ * to set divide by 3.5 mode in my 53c810 ...
+ */
+ OUTB (nc_scntl3, 0);

if (bootverbose >= 2)
printk ("%s: Delay (GEN=%d): %u msec\n", ncr_name(np), gen, ms);
- /*
- * adjust for prescaler, and convert into KHz
- */
+ /*
+ * adjust for prescaler, and convert into KHz
+ */
return ms ? ((1 << gen) * 4340) / ms : 0;
}

diff --git a/drivers/scsi/ncr53c8xx.h b/drivers/scsi/ncr53c8xx.h
index fa14b5c..b1567e8 100644
--- a/drivers/scsi/ncr53c8xx.h
+++ b/drivers/scsi/ncr53c8xx.h
@@ -757,7 +757,7 @@ struct ncr_reg {
#define IRQM 0x08 /* mod: irq mode (1 = totem pole !) */
#define STD 0x04 /* cmd: start dma mode */
#define IRQD 0x02 /* mod: irq disable */
- #define NOCOM 0x01 /* cmd: protect sfbr while reselect */
+ #define NOCOM 0x01 /* cmd: protect sfbr while reselect */
/* bits 0-1 rsvd for C1010 */

/*3c*/ u32 nc_adder;
--
2.8.1

2021-05-22 08:44:12

by Hui Tang

[permalink] [raw]
Subject: [PATCH 11/24] scsi: sun3_scsi: remove leading spaces before tabs

There are a few leading spaces before tabs and remove it by running
the following commard:

$ find . -name '*.[ch]' | xargs sed -r -i 's/^[ ]+\t/\t/'

Cc: Finn Thain <[email protected]>
Signed-off-by: Hui Tang <[email protected]>
---
drivers/scsi/sun3_scsi.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/scsi/sun3_scsi.c b/drivers/scsi/sun3_scsi.c
index 2e3fbc2..6125ed3 100644
--- a/drivers/scsi/sun3_scsi.c
+++ b/drivers/scsi/sun3_scsi.c
@@ -304,7 +304,7 @@ static int sun3scsi_dma_setup(struct NCR5380_hostdata *hostdata,
sun3_udc_write(UDC_INT_ENABLE, UDC_CSR);
#endif

- return count;
+ return count;

}

--
2.8.1

2021-05-22 08:44:12

by Hui Tang

[permalink] [raw]
Subject: [PATCH 15/24] scsi: qlogicfas408: remove leading spaces before tabs

There are a few leading spaces before tabs and remove it by running
the following commard:

$ find . -name '*.[ch]' | xargs sed -r -i 's/^[ ]+\t/\t/'

Signed-off-by: Hui Tang <[email protected]>
---
drivers/scsi/qlogicfas408.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/scsi/qlogicfas408.c b/drivers/scsi/qlogicfas408.c
index 136681a..e020182 100644
--- a/drivers/scsi/qlogicfas408.c
+++ b/drivers/scsi/qlogicfas408.c
@@ -26,8 +26,8 @@
Cleaned up 26/10/2002 by Alan Cox <[email protected]> as part of the 2.5
SCSI driver cleanup and audit. This driver still needs work on the
following
- - Non terminating hardware waits
- - Some layering violations with its pcmcia stub
+ - Non terminating hardware waits
+ - Some layering violations with its pcmcia stub

Redistributable under terms of the GNU General Public License

--
2.8.1

2021-05-22 08:44:12

by Hui Tang

[permalink] [raw]
Subject: [PATCH 14/24] scsi: proc: remove leading spaces before tabs

There are a few leading spaces before tabs and remove it by running
the following commard:

$ find . -name '*.[ch]' | xargs sed -r -i 's/^[ ]+\t/\t/'

Signed-off-by: Hui Tang <[email protected]>
---
drivers/scsi/scsi_proc.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/scsi/scsi_proc.c b/drivers/scsi/scsi_proc.c
index d6982d3..7cab3d7 100644
--- a/drivers/scsi/scsi_proc.c
+++ b/drivers/scsi/scsi_proc.c
@@ -106,7 +106,7 @@ void scsi_proc_hostdir_add(struct scsi_host_template *sht)
mutex_lock(&global_host_template_mutex);
if (!sht->present++) {
sht->proc_dir = proc_mkdir(sht->proc_name, proc_scsi);
- if (!sht->proc_dir)
+ if (!sht->proc_dir)
printk(KERN_ERR "%s: proc_mkdir failed for %s\n",
__func__, sht->proc_name);
}
--
2.8.1

2021-05-22 08:44:13

by Hui Tang

[permalink] [raw]
Subject: [PATCH 21/24] scsi: ips: remove leading spaces before tabs

There are a few leading spaces before tabs and remove it by running
the following commard:

$ find . -name '*.[ch]' | xargs sed -r -i 's/^[ ]+\t/\t/'

Cc: Adaptec OEM Raid Solutions <[email protected]>
Signed-off-by: Hui Tang <[email protected]>
---
drivers/scsi/ips.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/scsi/ips.c b/drivers/scsi/ips.c
index bc33d54..07e0ceb 100644
--- a/drivers/scsi/ips.c
+++ b/drivers/scsi/ips.c
@@ -3314,7 +3314,7 @@ ips_map_status(ips_ha_t * ha, ips_scb_t * scb, ips_stat_t * sp)
if (scb->scsi_cmd->cmnd[0] == INQUIRY) {
ips_scmd_buf_read(scb->scsi_cmd,
&inquiryData, sizeof (inquiryData));
- if ((inquiryData.DeviceType & 0x1f) == TYPE_DISK) {
+ if ((inquiryData.DeviceType & 0x1f) == TYPE_DISK) {
errcode = DID_TIME_OUT;
break;
}
@@ -4558,7 +4558,7 @@ ips_flush_and_reset(ips_ha_t *ha)
{
ips_scb_t *scb;
int ret;
- int time;
+ int time;
int done;
dma_addr_t command_dma;

--
2.8.1

2021-05-22 08:44:13

by Hui Tang

[permalink] [raw]
Subject: [PATCH 13/24] scsi: scsi_transport_fc: remove leading spaces before tabs

There are a few leading spaces before tabs and remove it by running
the following commard:

$ find . -name '*.[ch]' | xargs sed -r -i 's/^[ ]+\t/\t/'

Signed-off-by: Hui Tang <[email protected]>
---
drivers/scsi/scsi_transport_fc.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/scsi/scsi_transport_fc.c b/drivers/scsi/scsi_transport_fc.c
index da5b503..69fc8b8 100644
--- a/drivers/scsi/scsi_transport_fc.c
+++ b/drivers/scsi/scsi_transport_fc.c
@@ -2011,7 +2011,7 @@ store_fc_private_host_tgtid_bind_type(struct device *dev,
{
struct Scsi_Host *shost = transport_class_to_shost(dev);
struct fc_rport *rport;
- enum fc_tgtid_binding_type val;
+ enum fc_tgtid_binding_type val;
unsigned long flags;

if (get_fc_tgtid_bind_type_match(buf, &val))
--
2.8.1

2021-05-22 08:44:14

by Hui Tang

[permalink] [raw]
Subject: [PATCH 12/24] scsi: scsi_transport_spi: remove leading spaces before tabs

There are a few leading spaces before tabs and remove it by running
the following commard:

$ find . -name '*.[ch]' | xargs sed -r -i 's/^[ ]+\t/\t/'

Signed-off-by: Hui Tang <[email protected]>
---
drivers/scsi/scsi_transport_spi.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/scsi/scsi_transport_spi.c b/drivers/scsi/scsi_transport_spi.c
index c37dd15..6063c38 100644
--- a/drivers/scsi/scsi_transport_spi.c
+++ b/drivers/scsi/scsi_transport_spi.c
@@ -1230,8 +1230,8 @@ int spi_populate_tag_msg(unsigned char *msg, struct scsi_cmnd *cmd)
{
if (cmd->flags & SCMD_TAGGED) {
*msg++ = SIMPLE_QUEUE_TAG;
- *msg++ = cmd->request->tag;
- return 2;
+ *msg++ = cmd->request->tag;
+ return 2;
}

return 0;
--
2.8.1

2021-05-22 08:44:43

by Hui Tang

[permalink] [raw]
Subject: [PATCH 08/24] scsi: megaraid: remove leading spaces before tabs

There are a few leading spaces before tabs and remove it by running
the following commard:

$ find . -name '*.[ch]' | xargs sed -r -i 's/^[ ]+\t/\t/'

Cc: Kashyap Desai <[email protected]>
Signed-off-by: Hui Tang <[email protected]>
---
drivers/scsi/megaraid/mega_common.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/scsi/megaraid/mega_common.h b/drivers/scsi/megaraid/mega_common.h
index 2ad0aa2..5019ee3 100644
--- a/drivers/scsi/megaraid/mega_common.h
+++ b/drivers/scsi/megaraid/mega_common.h
@@ -249,7 +249,7 @@ typedef struct {
* ### Helper routines ###
*/
#define LSI_DBGLVL mraid_debug_level // each LLD must define a global
- // mraid_debug_level
+ // mraid_debug_level

#ifdef DEBUG
#if defined (_ASSERT_PANIC)
--
2.8.1

2021-05-22 08:44:44

by Hui Tang

[permalink] [raw]
Subject: [PATCH 24/24] scsi: aha1740: remove leading spaces before tabs

There are a few leading spaces before tabs and remove it by running
the following commard:

$ find . -name '*.[ch]' | xargs sed -r -i 's/^[ ]+\t/\t/'

Signed-off-by: Hui Tang <[email protected]>
---
drivers/scsi/aha1740.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/scsi/aha1740.c b/drivers/scsi/aha1740.c
index 0dc8310..006245c 100644
--- a/drivers/scsi/aha1740.c
+++ b/drivers/scsi/aha1740.c
@@ -614,7 +614,7 @@ static int aha1740_probe (struct device *dev)
return 0;

err_irq:
- free_irq(irq_level, shpnt);
+ free_irq(irq_level, shpnt);
err_unmap:
dma_unmap_single (&edev->dev, host->ecb_dma_addr,
sizeof (host->ecb), DMA_BIDIRECTIONAL);
--
2.8.1

2021-05-22 08:46:25

by Hui Tang

[permalink] [raw]
Subject: [PATCH 10/24] scsi: wd33c93: remove leading spaces before tabs

There are a few leading spaces before tabs and remove it by running
the following commard:

$ find . -name '*.[ch]' | xargs sed -r -i 's/^[ ]+\t/\t/'

Signed-off-by: Hui Tang <[email protected]>
---
drivers/scsi/wd33c93.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/scsi/wd33c93.c b/drivers/scsi/wd33c93.c
index a23277b..bf56c0f 100644
--- a/drivers/scsi/wd33c93.c
+++ b/drivers/scsi/wd33c93.c
@@ -1511,10 +1511,10 @@ reset_wd33c93(struct Scsi_Host *instance)
while ((read_aux_stat(regs) & ASR_BSY) && busycount++ < 100)
udelay (10);
/*
- * there are scsi devices out there, which manage to lock up
+ * there are scsi devices out there, which manage to lock up
* the wd33c93 in a busy condition. In this state it won't
* accept the reset command. The only way to solve this is to
- * give the chip a hardware reset (if possible). The code below
+ * give the chip a hardware reset (if possible). The code below
* does this for the SGI Indy, where this is possible
*/
/* still busy ? */
--
2.8.1

2021-05-22 08:46:25

by Hui Tang

[permalink] [raw]
Subject: [PATCH 23/24] scsi: dc395x: remove leading spaces before tabs

There are a few leading spaces before tabs and remove it by running
the following commard:

$ find . -name '*.[ch]' | xargs sed -r -i 's/^[ ]+\t/\t/'

Cc: Oliver Neukum <[email protected]>
Signed-off-by: Hui Tang <[email protected]>
---
drivers/scsi/dc395x.c | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/drivers/scsi/dc395x.c b/drivers/scsi/dc395x.c
index be87d5a..ccdbbf9 100644
--- a/drivers/scsi/dc395x.c
+++ b/drivers/scsi/dc395x.c
@@ -724,10 +724,10 @@ static struct DeviceCtlBlk *dcb_get_next(struct list_head *head,
}
/* if no next one take the head one (ie, wraparound) */
if (!next)
- list_for_each_entry(i, head, list) {
- next = i;
- break;
- }
+ list_for_each_entry(i, head, list) {
+ next = i;
+ break;
+ }

return next;
}
@@ -4370,13 +4370,13 @@ static int adapter_init(struct AdapterCtlBlk *acb, unsigned long io_port,

/* get eeprom configuration information and command line settings etc */
check_eeprom(&acb->eeprom, io_port);
- print_eeprom_settings(&acb->eeprom);
+ print_eeprom_settings(&acb->eeprom);

/* setup adapter control block */
adapter_init_params(acb);

/* display card connectors/termination settings */
- adapter_print_config(acb);
+ adapter_print_config(acb);

if (adapter_sg_tables_alloc(acb)) {
dprintkl(KERN_DEBUG, "Memory allocation for SG tables failed\n");
@@ -4641,12 +4641,12 @@ static int dc395x_init_one(struct pci_dev *dev, const struct pci_device_id *id)
dprintkl(KERN_INFO, "scsi_host_alloc failed\n");
goto fail;
}
- acb = (struct AdapterCtlBlk*)scsi_host->hostdata;
- acb->scsi_host = scsi_host;
- acb->dev = dev;
+ acb = (struct AdapterCtlBlk*)scsi_host->hostdata;
+ acb->scsi_host = scsi_host;
+ acb->dev = dev;

/* initialise the adapter and everything we need */
- if (adapter_init(acb, io_port_base, io_port_len, irq)) {
+ if (adapter_init(acb, io_port_base, io_port_len, irq)) {
dprintkl(KERN_INFO, "adapter init failed\n");
goto fail;
}
@@ -4660,7 +4660,7 @@ static int dc395x_init_one(struct pci_dev *dev, const struct pci_device_id *id)
}
pci_set_drvdata(dev, scsi_host);
scsi_scan_host(scsi_host);
-
+
return 0;

fail:
--
2.8.1

2021-05-22 08:46:25

by Hui Tang

[permalink] [raw]
Subject: [PATCH 17/24] scsi: pcmcia: remove leading spaces before tabs

There are a few leading spaces before tabs and remove it by running
the following commard:

$ find . -name '*.[ch]' | xargs sed -r -i 's/^[ ]+\t/\t/'

Cc: Lee Jones <[email protected]>
Signed-off-by: Hui Tang <[email protected]>
---
drivers/scsi/pcmcia/nsp_cs.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/scsi/pcmcia/nsp_cs.c b/drivers/scsi/pcmcia/nsp_cs.c
index ac89002..68ff39c1 100644
--- a/drivers/scsi/pcmcia/nsp_cs.c
+++ b/drivers/scsi/pcmcia/nsp_cs.c
@@ -937,7 +937,7 @@ static int nsp_nexus(struct scsi_cmnd *SCpnt)
nsp_setup_fifo(data, TRUE);

/* clear ack counter */
- data->FifoCount = 0;
+ data->FifoCount = 0;
nsp_index_write(base, POINTERCLR, POINTER_CLEAR |
ACK_COUNTER_CLEAR |
REQ_COUNTER_CLEAR |
--
2.8.1

2021-05-22 08:46:25

by Hui Tang

[permalink] [raw]
Subject: [PATCH 19/24] scsi: mesh: remove leading spaces before tabs

There are a few leading spaces before tabs and remove it by running
the following commard:

$ find . -name '*.[ch]' | xargs sed -r -i 's/^[ ]+\t/\t/'

Signed-off-by: Hui Tang <[email protected]>
---
drivers/scsi/mesh.c | 54 ++++++++++++++++++++++++++---------------------------
1 file changed, 27 insertions(+), 27 deletions(-)

diff --git a/drivers/scsi/mesh.c b/drivers/scsi/mesh.c
index 0a9f4e4..c6aa5a6 100644
--- a/drivers/scsi/mesh.c
+++ b/drivers/scsi/mesh.c
@@ -914,10 +914,10 @@ static void reselected(struct mesh_state *ms)
MKWORD(0, mr->error, mr->exception, mr->fifo_count));
}
out_8(&mr->interrupt, INT_ERROR | INT_EXCEPTION | INT_CMDDONE);
- mesh_flush_io(mr);
+ mesh_flush_io(mr);
udelay(1);
out_8(&mr->sequence, SEQ_ENBRESEL);
- mesh_flush_io(mr);
+ mesh_flush_io(mr);
udelay(1);
out_8(&mr->sync_params, ASYNC_PARAMS);

@@ -1010,7 +1010,7 @@ static void handle_reset(struct mesh_state *ms)
ms->msgphase = msg_none;
out_8(&mr->interrupt, INT_ERROR | INT_EXCEPTION | INT_CMDDONE);
out_8(&mr->sequence, SEQ_FLUSHFIFO);
- mesh_flush_io(mr);
+ mesh_flush_io(mr);
udelay(1);
out_8(&mr->sync_params, ASYNC_PARAMS);
out_8(&mr->sequence, SEQ_ENBRESEL);
@@ -1723,7 +1723,7 @@ static int mesh_host_reset(struct scsi_cmnd *cmd)
out_8(&mr->exception, 0xff); /* clear all exception bits */
out_8(&mr->error, 0xff); /* clear all error bits */
out_8(&mr->sequence, SEQ_RESETMESH);
- mesh_flush_io(mr);
+ mesh_flush_io(mr);
udelay(1);
out_8(&mr->intr_mask, INT_ERROR | INT_EXCEPTION | INT_CMDDONE);
out_8(&mr->source_id, ms->host->this_id);
@@ -1732,7 +1732,7 @@ static int mesh_host_reset(struct scsi_cmnd *cmd)

/* Reset the bus */
out_8(&mr->bus_status1, BS1_RST); /* assert RST */
- mesh_flush_io(mr);
+ mesh_flush_io(mr);
udelay(30); /* leave it on for >= 25us */
out_8(&mr->bus_status1, 0); /* negate RST */

@@ -1821,9 +1821,9 @@ static int mesh_shutdown(struct macio_dev *mdev)
volatile struct mesh_regs __iomem *mr;
unsigned long flags;

- printk(KERN_INFO "resetting MESH scsi bus(es)\n");
+ printk(KERN_INFO "resetting MESH scsi bus(es)\n");
spin_lock_irqsave(ms->host->host_lock, flags);
- mr = ms->mesh;
+ mr = ms->mesh;
out_8(&mr->intr_mask, 0);
out_8(&mr->interrupt, INT_ERROR | INT_EXCEPTION | INT_CMDDONE);
out_8(&mr->bus_status1, BS1_RST);
@@ -1870,17 +1870,17 @@ static int mesh_probe(struct macio_dev *mdev, const struct of_device_id *match)
}

if (macio_resource_count(mdev) != 2 || macio_irq_count(mdev) != 2) {
- printk(KERN_ERR "mesh: expected 2 addrs and 2 intrs"
+ printk(KERN_ERR "mesh: expected 2 addrs and 2 intrs"
" (got %d,%d)\n", macio_resource_count(mdev),
macio_irq_count(mdev));
return -ENODEV;
}

if (macio_request_resources(mdev, "mesh") != 0) {
- printk(KERN_ERR "mesh: unable to request memory resources");
+ printk(KERN_ERR "mesh: unable to request memory resources");
return -EBUSY;
}
- mesh_host = scsi_host_alloc(&mesh_template, sizeof(struct mesh_state));
+ mesh_host = scsi_host_alloc(&mesh_template, sizeof(struct mesh_state));
if (mesh_host == NULL) {
printk(KERN_ERR "mesh: couldn't register host");
goto out_release;
@@ -1888,12 +1888,12 @@ static int mesh_probe(struct macio_dev *mdev, const struct of_device_id *match)

/* Old junk for root discovery, that will die ultimately */
#if !defined(MODULE)
- note_scsi_host(mesh, mesh_host);
+ note_scsi_host(mesh, mesh_host);
#endif

mesh_host->base = macio_resource_start(mdev, 0);
mesh_host->irq = macio_irq(mdev, 0);
- ms = (struct mesh_state *) mesh_host->hostdata;
+ ms = (struct mesh_state *) mesh_host->hostdata;
macio_set_drvdata(mdev, ms);
ms->host = mesh_host;
ms->mdev = mdev;
@@ -1911,11 +1911,11 @@ static int mesh_probe(struct macio_dev *mdev, const struct of_device_id *match)
goto out_free;
}

- ms->meshintr = macio_irq(mdev, 0);
- ms->dmaintr = macio_irq(mdev, 1);
+ ms->meshintr = macio_irq(mdev, 0);
+ ms->dmaintr = macio_irq(mdev, 1);

- /* Space for dma command list: +1 for stop command,
- * +1 to allow for aligning.
+ /* Space for dma command list: +1 for stop command,
+ * +1 to allow for aligning.
*/
ms->dma_cmd_size = (mesh_host->sg_tablesize + 2) * sizeof(struct dbdma_cmd);

@@ -1931,25 +1931,25 @@ static int mesh_probe(struct macio_dev *mdev, const struct of_device_id *match)
}

ms->dma_cmds = (struct dbdma_cmd *) DBDMA_ALIGN(dma_cmd_space);
- ms->dma_cmd_space = dma_cmd_space;
+ ms->dma_cmd_space = dma_cmd_space;
ms->dma_cmd_bus = dma_cmd_bus + ((unsigned long)ms->dma_cmds)
- (unsigned long)dma_cmd_space;
ms->current_req = NULL;
- for (tgt = 0; tgt < 8; ++tgt) {
+ for (tgt = 0; tgt < 8; ++tgt) {
ms->tgts[tgt].sdtr_state = do_sdtr;
ms->tgts[tgt].sync_params = ASYNC_PARAMS;
ms->tgts[tgt].current_req = NULL;
- }
+ }

if ((cfp = of_get_property(mesh, "clock-frequency", NULL)))
- ms->clk_freq = *cfp;
+ ms->clk_freq = *cfp;
else {
- printk(KERN_INFO "mesh: assuming 50MHz clock frequency\n");
+ printk(KERN_INFO "mesh: assuming 50MHz clock frequency\n");
ms->clk_freq = 50000000;
- }
+ }

- /* The maximum sync rate is clock / 5; increase
- * mesh_sync_period if necessary.
+ /* The maximum sync rate is clock / 5; increase
+ * mesh_sync_period if necessary.
*/
minper = 1000000000 / (ms->clk_freq / 5); /* ns */
if (mesh_sync_period < minper)
@@ -1959,10 +1959,10 @@ static int mesh_probe(struct macio_dev *mdev, const struct of_device_id *match)
set_mesh_power(ms, 1);

/* Set it up */
- mesh_init(ms);
+ mesh_init(ms);

/* Request interrupt */
- if (request_irq(ms->meshintr, do_mesh_interrupt, 0, "MESH", ms)) {
+ if (request_irq(ms->meshintr, do_mesh_interrupt, 0, "MESH", ms)) {
printk(KERN_ERR "MESH: can't get irq %d\n", ms->meshintr);
goto out_shutdown;
}
@@ -2012,7 +2012,7 @@ static int mesh_remove(struct macio_dev *mdev)

/* Unmap registers & dma controller */
iounmap(ms->mesh);
- iounmap(ms->dma);
+ iounmap(ms->dma);

/* Free DMA commands memory */
dma_free_coherent(&macio_get_pci_dev(mdev)->dev, ms->dma_cmd_size,
--
2.8.1

2021-05-22 08:46:37

by Hui Tang

[permalink] [raw]
Subject: [PATCH 20/24] scsi: mac53c94: remove leading spaces before tabs

There are a few leading spaces before tabs and remove it by running
the following commard:

$ find . -name '*.[ch]' | xargs sed -r -i 's/^[ ]+\t/\t/'

Signed-off-by: Hui Tang <[email protected]>
---
drivers/scsi/mac53c94.c | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/drivers/scsi/mac53c94.c b/drivers/scsi/mac53c94.c
index ec9840d..f13c1cd 100644
--- a/drivers/scsi/mac53c94.c
+++ b/drivers/scsi/mac53c94.c
@@ -424,11 +424,11 @@ static int mac53c94_probe(struct macio_dev *mdev, const struct of_device_id *mat
}

if (macio_request_resources(mdev, "mac53c94") != 0) {
- printk(KERN_ERR "mac53c94: unable to request memory resources");
+ printk(KERN_ERR "mac53c94: unable to request memory resources");
return -EBUSY;
}

- host = scsi_host_alloc(&mac53c94_template, sizeof(struct fsc_state));
+ host = scsi_host_alloc(&mac53c94_template, sizeof(struct fsc_state));
if (host == NULL) {
printk(KERN_ERR "mac53c94: couldn't register host");
rc = -ENOMEM;
@@ -453,18 +453,18 @@ static int mac53c94_probe(struct macio_dev *mdev, const struct of_device_id *mat
}

clkprop = of_get_property(node, "clock-frequency", &proplen);
- if (clkprop == NULL || proplen != sizeof(int)) {
- printk(KERN_ERR "%pOF: can't get clock frequency, "
- "assuming 25MHz\n", node);
- state->clk_freq = 25000000;
- } else
- state->clk_freq = *(int *)clkprop;
-
- /* Space for dma command list: +1 for stop command,
- * +1 to allow for aligning.
+ if (clkprop == NULL || proplen != sizeof(int)) {
+ printk(KERN_ERR "%pOF: can't get clock frequency, "
+ "assuming 25MHz\n", node);
+ state->clk_freq = 25000000;
+ } else
+ state->clk_freq = *(int *)clkprop;
+
+ /* Space for dma command list: +1 for stop command,
+ * +1 to allow for aligning.
* XXX FIXME: Use DMA consistent routines
*/
- dma_cmd_space = kmalloc_array(host->sg_tablesize + 2,
+ dma_cmd_space = kmalloc_array(host->sg_tablesize + 2,
sizeof(struct dbdma_cmd),
GFP_KERNEL);
if (!dma_cmd_space) {
--
2.8.1

2021-05-22 08:46:39

by Hui Tang

[permalink] [raw]
Subject: [PATCH 09/24] scsi: zalon: remove leading spaces before tabs

There are a few leading spaces before tabs and remove it by running
the following commard:

$ find . -name '*.[ch]' | xargs sed -r -i 's/^[ ]+\t/\t/'

Signed-off-by: Hui Tang <[email protected]>
---
drivers/scsi/zalon.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/scsi/zalon.c b/drivers/scsi/zalon.c
index 7eac76c..3fef336 100644
--- a/drivers/scsi/zalon.c
+++ b/drivers/scsi/zalon.c
@@ -74,7 +74,7 @@ lasi_scsi_clock(void * hpa, int defaultclock)
}

printk(KERN_DEBUG "%s: SCSI clock %d\n", __func__, clock);
- return clock;
+ return clock;
}
#endif

--
2.8.1

2021-05-22 08:46:39

by Hui Tang

[permalink] [raw]
Subject: [PATCH 07/24] scsi: ibmvfc: remove leading spaces before tabs

There are a few leading spaces before tabs and remove it by running
the following commard:

$ find . -name '*.[ch]' | xargs sed -r -i 's/^[ ]+\t/\t/'

Cc: Michael Ellerman <[email protected]>
Signed-off-by: Hui Tang <[email protected]>
---
drivers/scsi/ibmvscsi/ibmvscsi.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/scsi/ibmvscsi/ibmvscsi.c b/drivers/scsi/ibmvscsi/ibmvscsi.c
index e75b0068..ae6a4fd 100644
--- a/drivers/scsi/ibmvscsi/ibmvscsi.c
+++ b/drivers/scsi/ibmvscsi/ibmvscsi.c
@@ -663,7 +663,7 @@ static int map_sg_list(struct scsi_cmnd *cmd, int nseg,
descr->len = cpu_to_be32(sg_dma_len(sg));
descr->key = 0;
total_length += sg_dma_len(sg);
- }
+ }
return total_length;
}

@@ -738,7 +738,7 @@ static int map_sg_data(struct scsi_cmnd *cmd,
sizeof(indirect->desc_list[0]));
memcpy(indirect->desc_list, evt_struct->ext_list,
MAX_INDIRECT_BUFS * sizeof(struct srp_direct_buf));
- return 1;
+ return 1;
}

/**
--
2.8.1

2021-05-22 08:48:34

by Hui Tang

[permalink] [raw]
Subject: [PATCH 22/24] scsi: dpt_i2o: remove leading spaces before tabs

There are a few leading spaces before tabs and remove it by running
the following commard:

$ find . -name '*.[ch]' | xargs sed -r -i 's/^[ ]+\t/\t/'

Cc: Adaptec OEM Raid Solutions <[email protected]>
Signed-off-by: Hui Tang <[email protected]>
---
drivers/scsi/dpt_i2o.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/scsi/dpt_i2o.c b/drivers/scsi/dpt_i2o.c
index a18a4a0..6861fe3 100644
--- a/drivers/scsi/dpt_i2o.c
+++ b/drivers/scsi/dpt_i2o.c
@@ -3348,7 +3348,7 @@ static int adpt_i2o_issue_params(int cmd, adpt_hba* pHba, int tid,

if ((wait_status = adpt_i2o_post_wait(pHba, msg, sizeof(msg), 20))) {
printk("adpt_i2o_issue_params: post_wait failed (%p)\n", resblk_va);
- return wait_status; /* -DetailedStatus */
+ return wait_status; /* -DetailedStatus */
}

if (res[1]&0x00FF0000) { /* BlockStatus != SUCCESS */
@@ -3375,7 +3375,7 @@ static s32 adpt_i2o_quiesce_hba(adpt_hba* pHba)
/* SysQuiesce discarded if IOP not in READY or OPERATIONAL state */

if((pHba->status_block->iop_state != ADAPTER_STATE_READY) &&
- (pHba->status_block->iop_state != ADAPTER_STATE_OPERATIONAL)){
+ (pHba->status_block->iop_state != ADAPTER_STATE_OPERATIONAL)){
return 0;
}

--
2.8.1

2021-05-22 22:40:03

by Finn Thain

[permalink] [raw]
Subject: Re: [PATCH 11/24] scsi: sun3_scsi: remove leading spaces before tabs


On Sat, 22 May 2021, Hui Tang wrote:

> There are a few leading spaces before tabs and remove it by running
> the following commard:
>
> $ find . -name '*.[ch]' | xargs sed -r -i 's/^[ ]+\t/\t/'
>

Acked-by: Finn Thain <[email protected]>

Is there a reason why your regexp is anchored? I thought spaces before any
tab would be undesirable.

> Cc: Finn Thain <[email protected]>
> Signed-off-by: Hui Tang <[email protected]>
> ---
> drivers/scsi/sun3_scsi.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/scsi/sun3_scsi.c b/drivers/scsi/sun3_scsi.c
> index 2e3fbc2..6125ed3 100644
> --- a/drivers/scsi/sun3_scsi.c
> +++ b/drivers/scsi/sun3_scsi.c
> @@ -304,7 +304,7 @@ static int sun3scsi_dma_setup(struct NCR5380_hostdata *hostdata,
> sun3_udc_write(UDC_INT_ENABLE, UDC_CSR);
> #endif
>
> - return count;
> + return count;
>
> }
>
>