From: Willy Tarreau <w@1wt.eu>
To: Denis Efremov <efremov@linux.com>
Cc: Jens Axboe <axboe@kernel.dk>,
linux-block@vger.kernel.org, linux-kernel@vger.kernel.org,
Willy Tarreau <w@1wt.eu>
Subject: [PATCH 15/23] floppy: cleanup: make need_more_output() not rely on current_fdc anymore
Date: Tue, 31 Mar 2020 11:40:46 +0200 [thread overview]
Message-ID: <20200331094054.24441-16-w@1wt.eu> (raw)
In-Reply-To: <20200331094054.24441-1-w@1wt.eu>
Now the fdc is passed in argument so that the function does not
use current_fdc anymore.
Signed-off-by: Willy Tarreau <w@1wt.eu>
---
drivers/block/floppy.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c
index 4aaf84217b53..aa2d840bf06b 100644
--- a/drivers/block/floppy.c
+++ b/drivers/block/floppy.c
@@ -1184,9 +1184,9 @@ static int result(int fdc)
#define MORE_OUTPUT -2
/* does the fdc need more output? */
-static int need_more_output(void)
+static int need_more_output(int fdc)
{
- int status = wait_til_ready(current_fdc);
+ int status = wait_til_ready(fdc);
if (status < 0)
return -1;
@@ -1194,7 +1194,7 @@ static int need_more_output(void)
if (is_ready_state(status))
return MORE_OUTPUT;
- return result(current_fdc);
+ return result(fdc);
}
/* Set perpendicular mode as required, based on data rate, if supported.
@@ -1244,7 +1244,7 @@ static int fdc_configure(void)
{
/* Turn on FIFO */
output_byte(current_fdc, FD_CONFIGURE);
- if (need_more_output() != MORE_OUTPUT)
+ if (need_more_output(current_fdc) != MORE_OUTPUT)
return 0;
output_byte(current_fdc, 0);
output_byte(current_fdc, 0x10 | (no_fifo & 0x20) | (fifo_depth & 0xf));
@@ -1302,7 +1302,7 @@ static void fdc_specify(void)
/* chose the default rate table, not the one
* where 1 = 2 Mbps */
output_byte(current_fdc, FD_DRIVESPEC);
- if (need_more_output() == MORE_OUTPUT) {
+ if (need_more_output(current_fdc) == MORE_OUTPUT) {
output_byte(current_fdc, UNIT(current_drive));
output_byte(current_fdc, 0xc0);
}
@@ -4324,7 +4324,7 @@ static char __init get_fdc_version(void)
}
output_byte(current_fdc, FD_PERPENDICULAR);
- if (need_more_output() == MORE_OUTPUT) {
+ if (need_more_output(current_fdc) == MORE_OUTPUT) {
output_byte(current_fdc, 0);
} else {
pr_info("FDC %d is an 82072A\n", current_fdc);
--
2.20.1
next prev parent reply other threads:[~2020-03-31 9:41 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-31 9:40 [PATCH 00/23] Floppy driver cleanups Willy Tarreau
2020-03-31 9:40 ` [PATCH 01/23] floppy: split the base port from the register in I/O accesses Willy Tarreau
2020-03-31 9:40 ` [PATCH 02/23] floppy: add references to 82077's extra registers Willy Tarreau
2020-03-31 9:40 ` [PATCH 03/23] floppy: use symbolic register names in the m68k port Willy Tarreau
2020-03-31 9:40 ` [PATCH 04/23] floppy: use symbolic register names in the parisc port Willy Tarreau
2020-03-31 9:40 ` [PATCH 05/23] floppy: use symbolic register names in the powerpc port Willy Tarreau
2020-03-31 9:40 ` [PATCH 06/23] floppy: use symbolic register names in the sparc32 port Willy Tarreau
2020-03-31 9:40 ` [PATCH 07/23] floppy: use symbolic register names in the sparc64 port Willy Tarreau
2020-04-14 9:20 ` Denis Efremov
2020-03-31 9:40 ` [PATCH 08/23] floppy: use symbolic register names in the x86 port Willy Tarreau
2020-03-31 9:40 ` [PATCH 09/23] floppy: cleanup: make twaddle() not rely on current_{fdc,drive} anymore Willy Tarreau
2020-03-31 9:40 ` [PATCH 10/23] floppy: cleanup: make reset_fdc_info() not rely on current_fdc anymore Willy Tarreau
2020-03-31 9:40 ` [PATCH 11/23] floppy: cleanup: make show_floppy() " Willy Tarreau
2020-03-31 9:40 ` [PATCH 12/23] floppy: cleanup: make wait_til_ready() " Willy Tarreau
2020-03-31 9:40 ` [PATCH 13/23] floppy: cleanup: make output_byte() " Willy Tarreau
2020-03-31 9:40 ` [PATCH 14/23] floppy: cleanup: make result() " Willy Tarreau
2020-03-31 9:40 ` Willy Tarreau [this message]
2020-03-31 9:40 ` [PATCH 16/23] floppy: cleanup: make perpendicular_mode() " Willy Tarreau
2020-03-31 9:40 ` [PATCH 17/23] floppy: cleanup: make fdc_configure() " Willy Tarreau
2020-03-31 9:40 ` [PATCH 18/23] floppy: cleanup: make fdc_specify() not rely on current_{fdc,drive} anymore Willy Tarreau
2020-03-31 9:40 ` [PATCH 19/23] floppy: cleanup: make check_wp() " Willy Tarreau
2020-03-31 9:40 ` [PATCH 20/23] floppy: cleanup: make next_valid_format() not rely on current_drive anymore Willy Tarreau
2020-03-31 9:40 ` [PATCH 21/23] floppy: cleanup: make get_fdc_version() not rely on current_fdc anymore Willy Tarreau
2020-03-31 9:40 ` [PATCH 22/23] floppy: cleanup: do not iterate on current_fdc in DMA grab/release functions Willy Tarreau
2020-04-10 8:35 ` Denis Efremov
2020-04-10 8:45 ` Willy Tarreau
2020-04-10 8:48 ` Denis Efremov
2020-04-10 9:32 ` Willy Tarreau
2020-04-10 9:30 ` [PATCH 24/23] floppy: cleanup: do not iterate on current_fdc in do_floppy_init() Willy Tarreau
2020-04-10 10:19 ` [PATCH 25/23] floppy: make sure to reset all FDCs upon resume() Willy Tarreau
2020-04-10 10:19 ` [PATCH 26/23] floppy: cleanup: get rid of current_reqD in favor of current_drive Willy Tarreau
2020-04-10 10:19 ` [PATCH 27/23] floppy: cleanup: make set_fdc() always set current_drive and current_fd Willy Tarreau
2020-03-31 9:40 ` [PATCH 23/23] floppy: cleanup: add a few comments about expectations in certain functions Willy Tarreau
2020-03-31 10:10 ` [PATCH 00/23] Floppy driver cleanups Christoph Hellwig
2020-03-31 11:01 ` Willy Tarreau
2020-03-31 15:28 ` Christoph Hellwig
2020-03-31 15:49 ` Willy Tarreau
2020-04-13 22:46 ` Jens Axboe
2020-04-14 5:31 ` Willy Tarreau
2020-04-14 10:29 ` Denis Efremov
2020-04-14 16:12 ` Willy Tarreau
2020-04-21 13:15 ` Denis Efremov
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=20200331094054.24441-16-w@1wt.eu \
--to=w@1wt.eu \
--cc=axboe@kernel.dk \
--cc=efremov@linux.com \
--cc=linux-block@vger.kernel.org \
--cc=linux-kernel@vger.kernel.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®