mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
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 v3 02/33] swim: Select appropriate drive once only
Date: Fri, 04 Sep 2026 19:26:36 +1000	[thread overview]
Message-ID: <370f73fcceb53ce4860904ce6cf4f06ade0e43d5.1788513996.git.fthain@linux-m68k.org> (raw)
In-Reply-To: <cover.1788513996.git.fthain@linux-m68k.org>

Before turning off the spindle motor, call swim_drive() to select the
appropriate drive. Remove the swim_drive() call from swim_add_floppy()
because it was already called by swim_floppy_init().

Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Fixes: 8852ecd97488 ("m68k: mac - Add SWIM floppy support")
Signed-off-by: Finn Thain <fthain@linux-m68k.org>
---
 drivers/block/swim.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/block/swim.c b/drivers/block/swim.c
index 5d89e7813049..4721e073a874 100644
--- a/drivers/block/swim.c
+++ b/drivers/block/swim.c
@@ -679,8 +679,10 @@ static void floppy_release(struct gendisk *disk)
 	else if (fs->ref_count > 0)
 		--fs->ref_count;
 
-	if (fs->ref_count == 0)
+	if (fs->ref_count == 0) {
+		swim_drive(base, fs->location);
 		swim_motor(base, OFF);
+	}
 	mutex_unlock(&swim_mutex);
 }
 
@@ -752,8 +754,6 @@ static int swim_add_floppy(struct swim_priv *swd, enum drive_location location)
 
 	fs->location = location;
 
-	swim_drive(base, location);
-
 	swim_motor(base, OFF);
 
 	fs->type = HD_MEDIA;
-- 
2.52.0


  parent reply	other threads:[~2026-09-04  9:31 UTC|newest]

Thread overview: 34+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-09-04  9:26 [PATCH v3 00/33] block/swim: Fixes and improvements Finn Thain
2026-09-04  9:26 ` [PATCH v3 01/33] swim: Assert strobe with stable outputs Finn Thain
2026-09-04  9:26 ` [PATCH v3 11/33] swim: Add track zero recalibration delay Finn Thain
2026-09-04  9:26 ` [PATCH v3 08/33] swim: Enable clock divider only where appropriate Finn Thain
2026-09-04  9:26 ` [PATCH v3 19/33] swim: Remove redundant RELAX actions Finn Thain
2026-09-04  9:26 ` [PATCH v3 17/33] swim: Fix buffer overflow Finn Thain
2026-09-04  9:26 ` [PATCH v3 12/33] swim: Handle FIFO timeout error Finn Thain
2026-09-04  9:26 ` [PATCH v3 22/33] swim: Revisit delays Finn Thain
2026-09-04  9:26 ` [PATCH v3 10/33] swim: Recalibrate when drive is probed Finn Thain
2026-09-04  9:26 ` [PATCH v3 04/33] swim: Don't disable drive after every sector Finn Thain
2026-09-04  9:26 ` [PATCH v3 31/33] swim: Define macros for constants Finn Thain
2026-09-04  9:26 ` [PATCH v3 16/33] swim: Don't use the mark register to read data Finn Thain
2026-09-04  9:26 ` [PATCH v3 07/33] swim: Refactor SWIM setup Finn Thain
2026-09-04  9:26 ` [PATCH v3 23/33] swim: Remove pointless mode0 register write Finn Thain
2026-09-04  9:26 ` [PATCH v3 13/33] swim: Simplify return value initialization Finn Thain
2026-09-04  9:26 ` [PATCH v3 06/33] swim: Configure parameter memory Finn Thain
2026-09-04  9:26 ` [PATCH v3 27/33] swim: Move swd initialization Finn Thain
2026-09-04  9:26 ` [PATCH v3 05/33] swim: Perform ISM/IWM mode switching according to specs Finn Thain
2026-09-04  9:26 ` [PATCH v3 14/33] swim: Check for CRC errors Finn Thain
2026-09-04  9:26 ` [PATCH v3 21/33] swim: Check drive ready bit Finn Thain
2026-09-04  9:26 ` [PATCH v3 09/33] swim: Don't start motor until medium is present Finn Thain
2026-09-04  9:26 ` [PATCH v3 18/33] swim: Convert to blocking queue Finn Thain
2026-09-04  9:26 ` [PATCH v3 20/33] swim: Deduplicate polling loops Finn Thain
2026-09-04  9:26 ` [PATCH v3 26/33] swim: Remove pointless specifiers Finn Thain
2026-09-04  9:26 ` Finn Thain [this message]
2026-09-04  9:26 ` [PATCH v3 29/33] swim: Remove unused macro definitions Finn Thain
2026-09-04  9:26 ` [PATCH v3 33/33] swim: Unexport global symbols Finn Thain
2026-09-04  9:26 ` [PATCH v3 15/33] swim: Check error register during sector read Finn Thain
2026-09-04  9:26 ` [PATCH v3 03/33] swim: Enable the drive when probing Finn Thain
2026-09-04  9:26 ` [PATCH v3 28/33] swim: Add some helpful references Finn Thain
2026-09-04  9:26 ` [PATCH v3 25/33] swim: Don't search beyond the first data mark Finn Thain
2026-09-04  9:26 ` [PATCH v3 24/33] swim: Don't needlessly re-read sectors Finn Thain
2026-09-04  9:26 ` [PATCH v3 30/33] swim: Clean up whitespace Finn Thain
2026-09-04  9:26 ` [PATCH v3 32/33] swim: Define symbols for constants 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=370f73fcceb53ce4860904ce6cf4f06ade0e43d5.1788513996.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®