From: Hannes Reinecke <hare@suse.de>
To: "Martin K. Petersen" <martin.petersen@oracle.com>
Cc: Christoph Hellwig <hch@lst.de>,
James Bottomley <james.bottomley@hansenpartnership.com>,
linux-scsi@vger.kernel.org, Bart van Assche <bvanassche@acm.org>,
Hannes Reinecke <hare@suse.de>
Subject: [PATCH 20/39] qlogicfas408: whitespace cleanup
Date: Fri, 23 Apr 2021 13:39:25 +0200 [thread overview]
Message-ID: <20210423113944.42672-21-hare@suse.de> (raw)
In-Reply-To: <20210423113944.42672-1-hare@suse.de>
Signed-off-by: Hannes Reinecke <hare@suse.de>
---
drivers/scsi/qlogicfas408.c | 61 +++++++++++++++++++------------------
1 file changed, 31 insertions(+), 30 deletions(-)
diff --git a/drivers/scsi/qlogicfas408.c b/drivers/scsi/qlogicfas408.c
index a1eabdc7db09..86de400ca81a 100644
--- a/drivers/scsi/qlogicfas408.c
+++ b/drivers/scsi/qlogicfas408.c
@@ -4,9 +4,9 @@
Use at your own risk. Support Tort Reform so you won't have to read all
these silly disclaimers.
- Copyright 1994, Tom Zerucha.
+ Copyright 1994, Tom Zerucha.
tz@execpc.com
-
+
Additional Code, and much appreciated help by
Michael A. Griffith
grif@cs.ucr.edu
@@ -22,12 +22,12 @@
Functions as standalone, loadable, and PCMCIA driver, the latter from
Dave Hinds' PCMCIA package.
-
+
Cleaned up 26/10/2002 by Alan Cox <alan@lxorguk.ukuu.org.uk> 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
@@ -92,8 +92,9 @@ static void ql_zap(struct qlogicfas408_priv *priv)
/*
* Do a pseudo-dma tranfer
*/
-
-static int ql_pdma(struct qlogicfas408_priv *priv, int phase, char *request, int reqlen)
+
+static int ql_pdma(struct qlogicfas408_priv *priv, int phase, char *request,
+ int reqlen)
{
int j;
int qbase = priv->qbase;
@@ -108,7 +109,7 @@ static int ql_pdma(struct qlogicfas408_priv *priv, int phase, char *request, int
request += 128;
}
while (reqlen >= 84 && !(j & 0xc0)) /* 2/3 */
- if ((j = inb(qbase + 8)) & 4)
+ if ((j = inb(qbase + 8)) & 4)
{
insl(qbase + 4, request, 21);
reqlen -= 84;
@@ -123,11 +124,11 @@ static int ql_pdma(struct qlogicfas408_priv *priv, int phase, char *request, int
/* until both empty and int (or until reclen is 0) */
rtrc(7)
j = 0;
- while (reqlen && !((j & 0x10) && (j & 0xc0)))
+ while (reqlen && !((j & 0x10) && (j & 0xc0)))
{
/* while bytes to receive and not empty */
j &= 0xc0;
- while (reqlen && !((j = inb(qbase + 8)) & 0x10))
+ while (reqlen && !((j = inb(qbase + 8)) & 0x10))
{
*request++ = inb(qbase + 4);
reqlen--;
@@ -161,7 +162,7 @@ static int ql_pdma(struct qlogicfas408_priv *priv, int phase, char *request, int
j = 0;
while (reqlen && !((j & 2) && (j & 0xc0))) {
/* while bytes to send and not full */
- while (reqlen && !((j = inb(qbase + 8)) & 2))
+ while (reqlen && !((j = inb(qbase + 8)) & 2))
{
outb(*request++, qbase + 4);
reqlen--;
@@ -175,7 +176,7 @@ static int ql_pdma(struct qlogicfas408_priv *priv, int phase, char *request, int
}
/*
- * Wait for interrupt flag (polled - not real hardware interrupt)
+ * Wait for interrupt flag (polled - not real hardware interrupt)
*/
static int ql_wai(struct qlogicfas408_priv *priv)
@@ -205,14 +206,14 @@ static int ql_wai(struct qlogicfas408_priv *priv)
}
/*
- * Initiate scsi command - queueing handler
+ * Initiate scsi command - queueing handler
* caller must hold host lock
*/
static void ql_icmd(struct scsi_cmnd *cmd)
{
struct qlogicfas408_priv *priv = get_priv_by_cmd(cmd);
- int qbase = priv->qbase;
+ int qbase = priv->qbase;
int int_type = priv->int_type;
unsigned int i;
@@ -253,7 +254,7 @@ static void ql_icmd(struct scsi_cmnd *cmd)
}
/*
- * Process scsi command - usually after interrupt
+ * Process scsi command - usually after interrupt
*/
static void ql_pcmd(struct scsi_cmnd *cmd)
@@ -329,7 +330,7 @@ static void ql_pcmd(struct scsi_cmnd *cmd)
rtrc(2);
/*
* Wait for irq (split into second state of irq handler
- * if this can take time)
+ * if this can take time)
*/
if ((k = ql_wai(priv))) {
set_host_byte(cmd, k);
@@ -339,9 +340,9 @@ static void ql_pcmd(struct scsi_cmnd *cmd)
}
/*
- * Enter Status (and Message In) Phase
+ * Enter Status (and Message In) Phase
*/
-
+
k = jiffies + WATCHDOG;
while (time_before(jiffies, k) && !priv->qabort &&
@@ -375,8 +376,8 @@ static void ql_pcmd(struct scsi_cmnd *cmd)
message = inb(qbase + 2);
/*
- * Should get function complete int if Status and message, else
- * bus serv if only status
+ * Should get function complete int if Status and message, else
+ * bus serv if only status
*/
if (!((i == 8 && j == 2) || (i == 0x10 && j == 1))) {
printk(KERN_ERR "Ql:Error during status phase, int=%02X, %d bytes recd\n", i, j);
@@ -390,9 +391,9 @@ static void ql_pcmd(struct scsi_cmnd *cmd)
}
/*
- * Should get bus service interrupt and disconnect interrupt
+ * Should get bus service interrupt and disconnect interrupt
*/
-
+
i = inb(qbase + 5); /* should be bus service */
while (!priv->qabort && ((i & 0x20) != 0x20)) {
barrier();
@@ -414,7 +415,7 @@ static void ql_pcmd(struct scsi_cmnd *cmd)
}
/*
- * Interrupt handler
+ * Interrupt handler
*/
static void ql_ihandl(void *dev_id)
@@ -438,8 +439,8 @@ static void ql_ihandl(void *dev_id)
ql_pcmd(icmd);
priv->qlcmd = NULL;
/*
- * If result is CHECK CONDITION done calls qcommand to request
- * sense
+ * If result is CHECK CONDITION done calls qcommand to request
+ * sense
*/
(icmd->scsi_done) (icmd);
}
@@ -484,8 +485,8 @@ static int qlogicfas408_queuecommand_lck(struct scsi_cmnd *cmd,
DEF_SCSI_QCMD(qlogicfas408_queuecommand)
-/*
- * Return bios parameters
+/*
+ * Return bios parameters
*/
int qlogicfas408_biosparam(struct scsi_device *disk, struct block_device *dev,
@@ -510,7 +511,7 @@ int qlogicfas408_biosparam(struct scsi_device *disk, struct block_device *dev,
/*
* Abort a command in progress
*/
-
+
int qlogicfas408_abort(struct scsi_cmnd *cmd)
{
struct qlogicfas408_priv *priv = get_priv_by_cmd(cmd);
@@ -589,9 +590,9 @@ void qlogicfas408_setup(int qbase, int id, int int_type)
int qlogicfas408_detect(int qbase, int int_type)
{
- REG1;
+ REG1;
return (((inb(qbase + 0xe) ^ inb(qbase + 0xe)) == 7) &&
- ((inb(qbase + 0xe) ^ inb(qbase + 0xe)) == 7));
+ ((inb(qbase + 0xe) ^ inb(qbase + 0xe)) == 7));
}
/*
--
2.29.2
next prev parent reply other threads:[~2021-04-23 11:40 UTC|newest]
Thread overview: 93+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-23 11:39 [RFC PATCHv2 00/39] SCSI result cleanup, part 2 Hannes Reinecke
2021-04-23 11:39 ` [PATCH 01/39] st: return error code in st_scsi_execute() Hannes Reinecke
2021-04-26 3:19 ` Bart Van Assche
2021-04-26 14:51 ` Christoph Hellwig
2021-04-23 11:39 ` [PATCH 02/39] scsi_ioctl: return error code when blk_rq_map_kern() fails Hannes Reinecke
2021-04-26 3:20 ` Bart Van Assche
2021-04-26 14:51 ` Christoph Hellwig
2021-04-23 11:39 ` [PATCH 03/39] scsi_dh_alua: do not interpret DRIVER_ERROR Hannes Reinecke
2021-04-26 14:54 ` Christoph Hellwig
2021-04-26 15:17 ` Hannes Reinecke
2021-04-23 11:39 ` [PATCH 04/39] scsi: Fixup calling convention for scsi_mode_sense() Hannes Reinecke
2021-04-26 3:21 ` Bart Van Assche
2021-04-26 14:57 ` Christoph Hellwig
2021-04-23 11:39 ` [PATCH 05/39] scsi: stop using DRIVER_ERROR Hannes Reinecke
2021-04-26 3:26 ` Bart Van Assche
2021-04-26 15:01 ` Christoph Hellwig
2021-04-23 11:39 ` [PATCH 06/39] scsi: introduce scsi_build_sense() Hannes Reinecke
2021-04-26 3:31 ` Bart Van Assche
2021-04-26 15:02 ` Christoph Hellwig
2021-04-23 11:39 ` [PATCH 07/39] scsi: introduce scsi_status_is_check_condition() Hannes Reinecke
2021-04-26 3:34 ` Bart Van Assche
2021-04-26 6:58 ` Hannes Reinecke
2021-04-26 15:02 ` Christoph Hellwig
2021-04-23 11:39 ` [PATCH 08/39] scsi: Kill DRIVER_SENSE Hannes Reinecke
2021-04-26 3:41 ` Bart Van Assche
2021-04-26 7:02 ` Hannes Reinecke
2021-04-26 15:20 ` Christoph Hellwig
2021-04-27 7:15 ` Hannes Reinecke
2021-04-23 11:39 ` [PATCH 09/39] scsi: do not use DRIVER_INVALID Hannes Reinecke
2021-04-26 3:42 ` Bart Van Assche
2021-04-26 15:20 ` Christoph Hellwig
2021-04-23 11:39 ` [PATCH 10/39] scsi_error: use DID_TIME_OUT instead of DRIVER_TIMEOUT Hannes Reinecke
2021-04-26 3:42 ` Bart Van Assche
2021-04-26 15:21 ` Christoph Hellwig
2021-04-26 15:38 ` Hannes Reinecke
2021-04-23 11:39 ` [PATCH 11/39] xen-scsiback: use DID_ERROR instead of DRIVER_ERROR Hannes Reinecke
2021-04-26 3:43 ` Bart Van Assche
2021-04-26 15:22 ` Christoph Hellwig
2021-04-23 11:39 ` [PATCH 12/39] xen-scsifront: compability status handling Hannes Reinecke
2021-04-26 3:44 ` Bart Van Assche
2021-04-26 7:03 ` Hannes Reinecke
2021-04-23 11:39 ` [PATCH 13/39] scsi: Drop the now obsolete driver_byte definitions Hannes Reinecke
2021-04-26 3:46 ` Bart Van Assche
2021-04-26 15:22 ` Christoph Hellwig
2021-04-23 11:39 ` [PATCH 14/39] NCR5380: Fold SCSI message ABORT onto DID_ABORT Hannes Reinecke
2021-04-26 15:23 ` Christoph Hellwig
2021-04-26 15:43 ` Hannes Reinecke
2021-04-23 11:39 ` [PATCH 15/39] scsi: add get_{status,host}_byte() accessor function Hannes Reinecke
2021-04-26 3:47 ` Bart Van Assche
2021-04-26 7:05 ` Hannes Reinecke
2021-04-26 15:23 ` Christoph Hellwig
2021-04-23 11:39 ` [PATCH 16/39] scsi: add translate_msg_byte() Hannes Reinecke
2021-04-26 3:48 ` Bart Van Assche
2021-04-26 15:24 ` Christoph Hellwig
2021-04-26 15:43 ` Hannes Reinecke
2021-04-23 11:39 ` [PATCH 17/39] dc395: use standard macros to set SCSI result Hannes Reinecke
2021-04-26 15:25 ` Christoph Hellwig
2021-04-23 11:39 ` [PATCH 18/39] dc395: translate message bytes Hannes Reinecke
2021-04-26 15:25 ` Christoph Hellwig
2021-04-23 11:39 ` [PATCH 19/39] qlogicfas408: make ql_pcmd() a void function Hannes Reinecke
2021-04-26 15:26 ` Christoph Hellwig
2021-04-26 15:45 ` Hannes Reinecke
2021-04-27 7:36 ` Hannes Reinecke
2021-04-23 11:39 ` Hannes Reinecke [this message]
2021-04-23 11:39 ` [PATCH 21/39] qlogicfas408: translate message to host byte status Hannes Reinecke
2021-04-23 11:39 ` [PATCH 22/39] nsp32: whitespace cleanup Hannes Reinecke
2021-04-23 11:39 ` [PATCH 23/39] nsp32: do not set message byte Hannes Reinecke
2021-04-23 11:39 ` [PATCH 24/39] wd33c93: translate message byte to host byte Hannes Reinecke
2021-04-24 9:20 ` Finn Thain
2021-04-26 9:07 ` Hannes Reinecke
2021-04-27 4:39 ` Finn Thain
2021-04-27 6:11 ` Hannes Reinecke
2021-04-23 11:39 ` [PATCH 25/39] mesh: translate message to host byte status Hannes Reinecke
2021-04-23 11:39 ` [PATCH 26/39] acornscsi: remove acornscsi_reportstatus() Hannes Reinecke
2021-04-26 15:32 ` Christoph Hellwig
2021-04-23 11:39 ` [PATCH 27/39] acornscsi: translate message byte to host byte Hannes Reinecke
2021-04-23 11:39 ` [PATCH 28/39] aha152x: modify done() to use separate status bytes Hannes Reinecke
2021-04-23 11:39 ` [PATCH 29/39] aha152x: do not set message byte when calling scsi_done() Hannes Reinecke
2021-04-23 11:39 ` [PATCH 30/39] advansys: do not set message byte in SCSI status Hannes Reinecke
2021-04-23 11:39 ` [PATCH 31/39] fas216: translate message to host byte status Hannes Reinecke
2021-04-23 11:39 ` [PATCH 32/39] fas216: Use get_status_byte() to avoid using linux-specific status codes Hannes Reinecke
2021-04-23 11:39 ` [PATCH 33/39] FlashPoint: Use standard SCSI definitions Hannes Reinecke
2021-04-23 11:39 ` [PATCH 34/39] fdomain: drop last argument to fdomain_finish_cmd() Hannes Reinecke
2021-04-23 11:39 ` [PATCH 35/39] fdomain: translate message to host byte status Hannes Reinecke
2021-04-24 9:21 ` Finn Thain
2021-04-23 11:39 ` [PATCH 36/39] scsi: drop message byte helper Hannes Reinecke
2021-04-26 3:48 ` Bart Van Assche
2021-04-23 11:39 ` [PATCH 37/39] scsi: kill message byte Hannes Reinecke
2021-04-26 3:50 ` Bart Van Assche
2021-04-23 11:39 ` [PATCH 38/39] target: use standard SAM status types Hannes Reinecke
2021-04-26 3:51 ` Bart Van Assche
2021-04-23 11:39 ` [PATCH 39/39] scsi: drop obsolete linux-specific SCSI status codes Hannes Reinecke
2021-04-26 3:55 ` Bart Van Assche
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210423113944.42672-21-hare@suse.de \
--to=hare@suse.de \
--cc=bvanassche@acm.org \
--cc=hch@lst.de \
--cc=james.bottomley@hansenpartnership.com \
--cc=linux-scsi@vger.kernel.org \
--cc=martin.petersen@oracle.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox