From: Finn Thain <fthain@linux-m68k.org>
To: Jens Axboe <axboe@kernel.dk>, Laurent Vivier <laurent@vivier.eu>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>,
Joshua Thompson <funaho@jurai.org>,
linux-block@vger.kernel.org, linux-m68k@lists.linux-m68k.org,
linux-kernel@vger.kernel.org
Subject: [PATCH v2 29/32] swim: Clean up whitespace
Date: Mon, 17 Aug 2026 11:17:10 +1000 [thread overview]
Message-ID: <26e2373aca64ad3e7fbc3f170f26315d1e445d75.1786929430.git.fthain@linux-m68k.org> (raw)
In-Reply-To: <cover.1786929430.git.fthain@linux-m68k.org>
No functional changes.
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Signed-off-by: Finn Thain <fthain@linux-m68k.org>
---
drivers/block/swim.c | 46 +++++++++++++++++++++-------------------
drivers/block/swim_asm.S | 14 +++---------
2 files changed, 27 insertions(+), 33 deletions(-)
diff --git a/drivers/block/swim.c b/drivers/block/swim.c
index aebebc7f5d60..73d11e827e5d 100644
--- a/drivers/block/swim.c
+++ b/drivers/block/swim.c
@@ -2,7 +2,7 @@
/*
* Driver for SWIM (Sander Woz Integrated Machine) floppy controller
*
- * Copyright (C) 2004,2008 Laurent Vivier <Laurent@lvivier.info>
+ * Copyright (C) 2004, 2008 Laurent Vivier <Laurent@lvivier.info>
*
* based on Alastair Bridgewater SWIM analysis, 2001
* based on SWIM3 driver (c) Paul Mackerras, 1996
@@ -69,7 +69,7 @@ struct swim {
REG(read_handshake)
} __attribute__((packed));
-#define swim_write(base, reg, v) out_8(&(base)->write_##reg, (v))
+#define swim_write(base, reg, v) out_8(&(base)->write_##reg, (v))
#define swim_read(base, reg) in_8(&(base)->read_##reg)
/* IWM registers */
@@ -93,7 +93,7 @@ struct iwm {
REG(q7H)
} __attribute__((packed));
-#define iwm_write(base, reg, v) out_8(&(base)->reg, (v))
+#define iwm_write(base, reg, v) out_8(&(base)->reg, (v))
#define iwm_read(base, reg) in_8(&(base)->reg)
/* Bits in phase register */
@@ -165,23 +165,23 @@ struct floppy_state {
/* physical properties */
enum drive_location location; /* internal or external drive */
- int head_number; /* single- or double-sided drive */
+ int head_number; /* single- or double-sided drive */
/* media */
- int disk_in;
- int ejected;
- enum media_type type;
- int write_protected;
+ int disk_in;
+ int ejected;
+ enum media_type type;
+ int write_protected;
- unsigned int total_secs;
- unsigned int secpercyl;
- unsigned int secpertrack;
+ unsigned int total_secs;
+ unsigned int secpercyl;
+ unsigned int secpertrack;
/* in-use information */
- int track;
- int ref_count;
+ int track;
+ int ref_count;
bool registered;
struct gendisk *disk;
@@ -216,6 +216,7 @@ extern int swim_read_sector_data(struct swim __iomem *base,
unsigned char *data);
static DEFINE_MUTEX(swim_mutex);
+
static void set_swim_mode(struct swim __iomem *base, int enable)
{
struct iwm __iomem *iwm_base = (struct iwm __iomem *)base;
@@ -402,7 +403,7 @@ static int swim_seek(struct swim __iomem *base, int step)
if (step == 0)
return 0;
- for ( ; step > 0; step--) {
+ for (; step > 0; step--) {
if (swim_step(base))
return -1;
}
@@ -413,7 +414,7 @@ static int swim_seek(struct swim __iomem *base, int step)
return 0;
}
-static int swim_track(struct floppy_state *fs, int track)
+static int swim_track(struct floppy_state *fs, int track)
{
struct swim __iomem *base = fs->swd->base;
int ret;
@@ -552,10 +553,10 @@ static blk_status_t swim_queue_rq(struct blk_mq_hw_ctx *hctx,
}
static struct floppy_struct floppy_type[4] = {
- { 0, 0, 0, 0, 0, 0x00, 0x00, 0x00, 0x00, NULL }, /* no testing */
+ { 0, 0, 0, 0, 0, 0x00, 0x00, 0x00, 0x00, NULL }, /* no testing */
{ 720, 9, 1, 80, 0, 0x2A, 0x02, 0xDF, 0x50, NULL }, /* 360KB SS 3.5"*/
- { 1440, 9, 2, 80, 0, 0x2A, 0x02, 0xDF, 0x50, NULL }, /* 720KB 3.5" */
- { 2880, 18, 2, 80, 0, 0x1B, 0x00, 0xCF, 0x6C, NULL }, /* 1.44MB 3.5" */
+ { 1440, 9, 2, 80, 0, 0x2A, 0x02, 0xDF, 0x50, NULL }, /* 720KB 3.5" */
+ { 2880, 18, 2, 80, 0, 0x1B, 0x00, 0xCF, 0x6C, NULL }, /* 1.44MB 3.5" */
};
static int get_floppy_geometry(struct floppy_state *fs, int type,
@@ -582,10 +583,11 @@ static void setup_medium(struct floppy_state *fs)
if (swim_readbit(base, DISK_IN)) {
struct floppy_struct *g;
+
fs->disk_in = 1;
fs->write_protected = swim_readbit(base, WRITE_PROT);
fs->type = swim_readbit(base, TWOMEG_MEDIA) ?
- HD_MEDIA : DD_MEDIA;
+ HD_MEDIA : DD_MEDIA;
fs->head_number = swim_readbit(base, SINGLE_SIDED) ? 1 : 2;
get_floppy_geometry(fs, 0, &g);
fs->total_secs = g->size;
@@ -687,7 +689,7 @@ static int floppy_ioctl(struct block_device *bdev, blk_mode_t mode,
int err;
if ((cmd & 0x80) && !capable(CAP_SYS_ADMIN))
- return -EPERM;
+ return -EPERM;
switch (cmd) {
case FDEJECT:
@@ -805,7 +807,7 @@ static int swim_floppy_init(struct platform_device *pdev)
struct swim_priv *swd = platform_get_drvdata(pdev);
unsigned int *data = pdev->dev.platform_data;
struct queue_limits lim = {
- .features = BLK_FEAT_ROTATIONAL,
+ .features = BLK_FEAT_ROTATIONAL,
};
int err;
int drive;
@@ -957,7 +959,7 @@ static void swim_remove(struct platform_device *dev)
static struct platform_driver swim_driver = {
.probe = swim_probe,
.remove = swim_remove,
- .driver = {
+ .driver = {
.name = CARDNAME,
},
};
diff --git a/drivers/block/swim_asm.S b/drivers/block/swim_asm.S
index 4913470b63e8..c8a89c0c4652 100644
--- a/drivers/block/swim_asm.S
+++ b/drivers/block/swim_asm.S
@@ -5,7 +5,7 @@
* needs assembly language because is very timing dependent
* this controller exists only on macintosh 680x0 based
*
- * Copyright (C) 2004,2008 Laurent Vivier <Laurent@lvivier.info>
+ * Copyright (C) 2004, 2008 Laurent Vivier <Laurent@lvivier.info>
*
* based on Alastair Bridgewater SWIM analysis, 2001
* based on netBSD IWM driver (c) 1997, 1998 Hauke Fath.
@@ -110,7 +110,6 @@ sector_data_mark:
/* read header */
moveq #max_retry, %d2
-
amark0: tstb %a2@
dbmi %d2, amark0
bpl signal_nonyb
@@ -118,7 +117,6 @@ amark0: tstb %a2@
moveb %a5@, %a4@(o_track)
moveq #max_retry, %d2
-
amark1: tstb %a2@
dbmi %d2, amark1
bpl signal_nonyb
@@ -126,7 +124,6 @@ amark1: tstb %a2@
moveb %a5@, %a4@(o_side)
moveq #max_retry, %d2
-
amark2: tstb %a2@
dbmi %d2, amark2
bpl signal_nonyb
@@ -134,7 +131,6 @@ amark2: tstb %a2@
moveb %a5@, %a4@(o_sector)
moveq #max_retry, %d2
-
amark3: tstb %a2@
dbmi %d2, amark3
bpl signal_nonyb
@@ -142,7 +138,6 @@ amark3: tstb %a2@
moveb %a5@, %a4@(o_size)
moveq #max_retry, %d2
-
crc0: tstb %a2@
dbmi %d2, crc0
bpl signal_nonyb
@@ -150,7 +145,6 @@ crc0: tstb %a2@
moveb %a5@, %a4@(o_crc0)
moveq #max_retry, %d2
-
crc1: moveb %a2@, %d5
dbmi %d2, crc1
bpl signal_nonyb
@@ -197,13 +191,14 @@ mfm_read_data:
/* read data */
- movel #sector_size-1, %d4 /* sector size */
+ movel #sector_size - 1, %d4 /* sector size */
movew #max_retry, %d2
read_data_loop:
moveb %a2@, %d5
andb #(.Lhr_fifo_1byte + .Lhr_fifo_2bytes), %d5
dbne %d2, read_data_loop
beq data_exit
+
moveq #max_retry, %d2
moveb %a5@, %d3
bsr .Lmaybe_store
@@ -219,7 +214,6 @@ read_data_loop:
movew #max_retry, %d2
data_crc0:
-
tstb %a2@
dbmi %d2, data_crc0
bpl data_exit
@@ -227,9 +221,7 @@ data_crc0:
moveb %a5@, %d2
moveq #max_retry, %d2
-
data_crc1:
-
moveb %a2@, %d5
dbmi %d2, data_crc1
bpl data_exit
--
2.52.0
next prev parent reply other threads:[~2026-08-17 1:58 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-08-17 1:17 [PATCH v2 00/32] block/swim: Fixes and improvements Finn Thain
2026-08-17 1:17 ` [PATCH v2 10/32] swim: Add track zero recalibration delay Finn Thain
2026-08-17 1:17 ` [PATCH v2 09/32] swim: Recalibrate when drive is probed Finn Thain
2026-08-17 1:17 ` [PATCH v2 08/32] swim: Don't start motor until medium is present Finn Thain
2026-08-17 1:17 ` [PATCH v2 32/32] swim: Unexport global symbols Finn Thain
2026-08-17 1:17 ` [PATCH v2 27/32] swim: Add some helpful references Finn Thain
2026-08-17 1:17 ` [PATCH v2 02/32] swim: Select appropriate drive once only Finn Thain
2026-08-17 1:17 ` [PATCH v2 26/32] swim: Move swd initialization Finn Thain
2026-08-17 1:17 ` [PATCH v2 20/32] swim: Check drive ready bit Finn Thain
2026-08-17 1:17 ` [PATCH v2 28/32] swim: Remove unused macro definitions Finn Thain
2026-08-17 1:17 ` [PATCH v2 13/32] swim: Check for CRC errors Finn Thain
2026-08-17 1:17 ` [PATCH v2 03/32] swim: Enable the drive when probing Finn Thain
2026-08-17 1:17 ` [PATCH v2 31/32] swim: Define symbols for constants Finn Thain
2026-08-17 1:17 ` [PATCH v2 24/32] swim: Don't search beyond the first data mark Finn Thain
2026-08-17 1:17 ` [PATCH v2 18/32] swim: Remove redundant RELAX actions Finn Thain
2026-08-17 1:17 ` [PATCH v2 23/32] swim: Don't needlessly re-read sectors Finn Thain
2026-08-17 1:17 ` [PATCH v2 17/32] swim: Convert to blocking queue Finn Thain
2026-08-17 1:17 ` [PATCH v2 05/32] swim: Perform ISM/IWM mode switching according to specs Finn Thain
2026-08-17 1:17 ` [PATCH v2 04/32] swim: Don't disable drive after every sector Finn Thain
2026-08-17 1:17 ` [PATCH v2 16/32] swim: Fix buffer overflow Finn Thain
2026-08-17 1:17 ` [PATCH v2 19/32] swim: Deduplicate polling loops Finn Thain
2026-08-17 1:17 ` [PATCH v2 07/32] swim: Enable clock divider only where appropriate Finn Thain
2026-08-31 7:38 ` Geert Uytterhoeven
2026-09-01 7:56 ` Finn Thain
2026-09-01 9:10 ` Geert Uytterhoeven
2026-08-17 1:17 ` [PATCH v2 11/32] swim: Handle FIFO timeout error Finn Thain
2026-08-17 1:17 ` [PATCH v2 25/32] swim: Remove pointless specifiers Finn Thain
2026-08-17 1:17 ` [PATCH v2 22/32] swim: Remove pointless mode0 register write Finn Thain
2026-08-17 1:17 ` [PATCH v2 14/32] swim: Check error register during sector read Finn Thain
2026-08-17 1:17 ` [PATCH v2 21/32] swim: Revisit delays Finn Thain
2026-08-17 1:17 ` [PATCH v2 30/32] swim: Define macros for constants Finn Thain
2026-08-17 1:17 ` [PATCH v2 12/32] swim: Simplify return value initialization Finn Thain
2026-08-17 1:17 ` Finn Thain [this message]
2026-08-17 1:17 ` [PATCH v2 15/32] swim: Don't use the mark register to read data Finn Thain
2026-08-17 1:17 ` [PATCH v2 01/32] swim: Assert strobe with stable outputs Finn Thain
2026-08-17 1:17 ` [PATCH v2 06/32] swim: Configure parameter memory Finn Thain
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=26e2373aca64ad3e7fbc3f170f26315d1e445d75.1786929430.git.fthain@linux-m68k.org \
--to=fthain@linux-m68k.org \
--cc=axboe@kernel.dk \
--cc=funaho@jurai.org \
--cc=geert@linux-m68k.org \
--cc=laurent@vivier.eu \
--cc=linux-block@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-m68k@lists.linux-m68k.org \
/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
all inboxes | Powered by JetHome®