From: Joe Perches <joe@perches.com>
To: Denis Efremov <efremov@linux.com>, linux-block@vger.kernel.org
Cc: Willy Tarreau <w@1wt.eu>, Christoph Hellwig <hch@infradead.org>,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH v3 0/4] floppy: suppress UBSAN warning in setup_rw_floppy()
Date: Fri, 01 May 2020 11:02:31 -0700 [thread overview]
Message-ID: <c05138cb12f43498299d2b438173d082be2ebf17.camel@perches.com> (raw)
In-Reply-To: <20200501134416.72248-1-efremov@linux.com>
On Fri, 2020-05-01 at 16:44 +0300, Denis Efremov wrote:
> These patches are based on Willy's cleanup patches
> https://lkml.org/lkml/2020/3/31/609.
Maybe add pr_fmt and clean up a few messages so
all the logging output is prefixed too.
---
drivers/block/floppy.c | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c
index c3daa64..b26bb1 100644
--- a/drivers/block/floppy.c
+++ b/drivers/block/floppy.c
@@ -145,6 +145,8 @@
* Better audit of register_blkdev.
*/
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
#undef FLOPPY_SILENT_DCL_CLEAR
#define REALLY_SLOW_IO
@@ -1724,7 +1726,7 @@ irqreturn_t floppy_interrupt(int irq, void *dev_id)
if (current_fdc >= N_FDC || fdc_state[current_fdc].address == -1) {
/* we don't even know which FDC is the culprit */
pr_info("DOR0=%x\n", fdc_state[0].dor);
- pr_info("floppy interrupt on bizarre fdc %d\n", current_fdc);
+ pr_info("interrupt on bizarre fdc %d\n", current_fdc);
pr_info("handler=%ps\n", handler);
is_alive(__func__, "bizarre fdc");
return IRQ_NONE;
@@ -2276,7 +2278,7 @@ static void request_done(int uptodate)
reschedule_timeout(MAXTIMEOUT, msg);
if (!req) {
- pr_info("floppy.c: no request in request_done\n");
+ pr_info("no request in request_done\n");
return;
}
@@ -4181,8 +4183,7 @@ static void floppy_rb0_cb(struct bio *bio)
int drive = cbdata->drive;
if (bio->bi_status) {
- pr_info("floppy: error %d while reading block 0\n",
- bio->bi_status);
+ pr_info("error %d while reading block 0\n", bio->bi_status);
set_bit(FD_OPEN_SHOULD_FAIL_BIT, &drive_state[drive].flags);
}
complete(&cbdata->complete);
@@ -4954,7 +4955,7 @@ static void floppy_release_irq_and_dma(void)
#endif
if (delayed_work_pending(&fd_timeout))
- pr_info("floppy timer still active:%s\n", timeout_message);
+ pr_info("timer still active:%s\n", timeout_message);
if (delayed_work_pending(&fd_timer))
pr_info("auxiliary floppy timer still active\n");
if (work_pending(&floppy_work))
next prev parent reply other threads:[~2020-05-01 18:02 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-01 13:44 [PATCH v3 0/4] floppy: suppress UBSAN warning in setup_rw_floppy() Denis Efremov
2020-05-01 13:44 ` [PATCH v3 1/4] floppy: use print_hex_dump() in setup_DMA() Denis Efremov
2020-05-01 15:35 ` Christoph Hellwig
2020-05-01 13:44 ` [PATCH v3 2/4] floppy: add FD_AUTODETECT_SIZE define for struct floppy_drive_params Denis Efremov
2020-05-01 15:36 ` Christoph Hellwig
2020-05-01 13:44 ` [PATCH v3 3/4] floppy: add defines for sizes of cmd & reply buffers of floppy_raw_cmd Denis Efremov
2020-05-01 13:44 ` [PATCH v3 4/4] floppy: suppress UBSAN warning in setup_rw_floppy() Denis Efremov
2020-05-01 18:02 ` Joe Perches [this message]
2020-05-01 18:22 ` [PATCH v3 0/4] " Denis Efremov
2020-05-01 18:31 ` Joe Perches
2020-05-06 7:33 ` 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=c05138cb12f43498299d2b438173d082be2ebf17.camel@perches.com \
--to=joe@perches.com \
--cc=efremov@linux.com \
--cc=hch@infradead.org \
--cc=linux-block@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=w@1wt.eu \
/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;
as well as URLs for NNTP newsgroup(s).