From: Borislav Petkov <bbpetkov@yahoo.de>
To: <bzolnier@gmail.com>
Cc: linux-kernel@vger.kernel.org, linux-ide@vger.kernel.org,
Borislav Petkov <bbpetkov@yahoo.de>
Subject: [PATCH 9/12] ide-floppy: remove unused IDEFLOPPY_USE_READ12
Date: Sun, 13 Jan 2008 21:18:22 +0100 [thread overview]
Message-ID: <1200255505-31418-10-git-send-email-bbpetkov@yahoo.de> (raw)
In-Reply-To: <1200255505-31418-9-git-send-email-bbpetkov@yahoo.de>
This flag is not being set anywhere in the driver so it can go.
Signed-off-by: Borislav Petkov <bbpetkov@yahoo.de>
---
drivers/ide/ide-floppy.c | 17 ++++++-----------
1 files changed, 6 insertions(+), 11 deletions(-)
diff --git a/drivers/ide/ide-floppy.c b/drivers/ide/ide-floppy.c
index 6c917fc..790e33f 100644
--- a/drivers/ide/ide-floppy.c
+++ b/drivers/ide/ide-floppy.c
@@ -180,7 +180,6 @@ typedef struct ide_floppy_obj {
*/
#define IDEFLOPPY_DRQ_INTERRUPT 0 /* DRQ interrupt device */
#define IDEFLOPPY_MEDIA_CHANGED 1 /* Media may have changed */
-#define IDEFLOPPY_USE_READ12 2 /* Use READ12/WRITE12 or READ10/WRITE10 */
#define IDEFLOPPY_FORMAT_IN_PROGRESS 3 /* Format in progress */
#define IDEFLOPPY_CLIK_DRIVE 4 /* Avoid commands not supported in Clik drive */
#define IDEFLOPPY_ZIP_DRIVE 5 /* Requires BH algorithm for packets */
@@ -889,25 +888,21 @@ static void idefloppy_create_test_unit_ready_cmd(idefloppy_pc_t *pc)
pc->c[0] = GPCMD_TEST_UNIT_READY;
}
-static void idefloppy_create_rw_cmd (idefloppy_floppy_t *floppy, idefloppy_pc_t *pc, struct request *rq, unsigned long sector)
+static void idefloppy_create_rw_cmd(idefloppy_floppy_t *floppy,
+ idefloppy_pc_t *pc, struct request *rq, unsigned long sector)
{
int block = sector / floppy->bs_factor;
int blocks = rq->nr_sectors / floppy->bs_factor;
int cmd = rq_data_dir(rq);
- debug_log("create_rw1%d_cmd: block == %d, blocks == %d\n",
- 2 * test_bit (IDEFLOPPY_USE_READ12, &floppy->flags),
+ debug_log("create_rw10_cmd: block == %d, blocks == %d\n",
block, blocks);
idefloppy_init_pc(pc);
- if (test_bit(IDEFLOPPY_USE_READ12, &floppy->flags)) {
- pc->c[0] = cmd == READ ? GPCMD_READ_12 : GPCMD_WRITE_12;
- put_unaligned(cpu_to_be32(blocks), (unsigned int *) &pc->c[6]);
- } else {
- pc->c[0] = cmd == READ ? GPCMD_READ_10 : GPCMD_WRITE_10;
- put_unaligned(cpu_to_be16(blocks), (unsigned short *)&pc->c[7]);
- }
+ pc->c[0] = cmd == READ ? GPCMD_READ_10 : GPCMD_WRITE_10;
+ put_unaligned(cpu_to_be16(blocks), (unsigned short *)&pc->c[7]);
put_unaligned(cpu_to_be32(block), (unsigned int *) &pc->c[2]);
+
pc->callback = &idefloppy_rw_callback;
pc->rq = rq;
pc->b_count = cmd == READ ? 0 : rq->bio->bi_size;
--
1.5.3.7
next prev parent reply other threads:[~2008-01-13 20:24 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-01-13 20:18 [PATCH 0/12] ide-floppy redux v2.5 Borislav Petkov
2008-01-13 20:18 ` [PATCH 1/12] ide-floppy: remove struct idefloppy_mode_parameter_header Borislav Petkov
2008-01-13 20:18 ` [PATCH 2/12] ide-floppy: remove struct idefloppy_flexible_disk_page Borislav Petkov
2008-01-13 20:18 ` [PATCH 3/12] ide-floppy: remove struct idefloppy_capacity_descriptor Borislav Petkov
2008-01-13 20:18 ` [PATCH 4/12] ide-floppy: factor out ioctl handlers from idefloppy_ioctl() Borislav Petkov
2008-01-13 20:18 ` [PATCH 5/12] ide-floppy: report DMA handling in idefloppy_pc_intr() properly Borislav Petkov
2008-01-13 20:18 ` [PATCH 6/12] ide-floppy: mv idefloppy_{should_,}report_error Borislav Petkov
2008-01-13 20:18 ` [PATCH 7/12] ide-floppy: remove IDEFLOPPY_DEBUG_BUGS macro Borislav Petkov
2008-01-13 20:18 ` [PATCH 8/12] ide-floppy: merge idefloppy_{input,output}_buffers Borislav Petkov
2008-01-13 20:18 ` Borislav Petkov [this message]
2008-01-13 20:18 ` [PATCH 10/12] ide-floppy: remove atomic test_*bit macros Borislav Petkov
2008-01-13 20:18 ` [PATCH 11/12] ide-floppy: remove IDEFLOPPY_DEBUG_INFO Borislav Petkov
2008-01-13 20:18 ` [PATCH 12/12] ide-floppy: fix most of the remaining checkpatch.pl issues Borislav Petkov
2008-01-15 20:12 ` (was: Re:...) [PATCH 12/12] ide-floppy: fix most of the remaining checkpatch.pl issues-v2 Borislav Petkov
2008-01-16 22:51 ` Bartlomiej Zolnierkiewicz
2008-01-14 21:51 ` [PATCH 11/12] ide-floppy: remove IDEFLOPPY_DEBUG_INFO Bartlomiej Zolnierkiewicz
2008-01-14 21:50 ` [PATCH 10/12] ide-floppy: remove atomic test_*bit macros Bartlomiej Zolnierkiewicz
2008-01-14 22:32 ` Bartlomiej Zolnierkiewicz
2008-01-15 20:09 ` Borislav Petkov
2008-01-16 22:08 ` Bartlomiej Zolnierkiewicz
2008-01-15 7:07 ` Borislav Petkov
2008-01-15 20:10 ` Borislav Petkov
2008-01-16 22:25 ` Bartlomiej Zolnierkiewicz
2008-01-14 21:38 ` [PATCH 8/12] ide-floppy: merge idefloppy_{input,output}_buffers Bartlomiej Zolnierkiewicz
2008-01-15 7:14 ` Borislav Petkov
2008-01-14 21:38 ` [PATCH 0/12] ide-floppy redux v2.5 Bartlomiej Zolnierkiewicz
2008-01-20 12:38 ` Borislav Petkov
2008-01-21 22:45 ` Bartlomiej Zolnierkiewicz
2008-01-22 5:32 ` Borislav Petkov
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=1200255505-31418-10-git-send-email-bbpetkov@yahoo.de \
--to=bbpetkov@yahoo.de \
--cc=bzolnier@gmail.com \
--cc=linux-ide@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®