[PATCH 14/18] ide-floppy: fold idefloppy_create_test_unit_ready_cmd into idefloppy_open

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
From: Borislav Petkov
Date: Wednesday, June 11, 2008 - 11:41 pm

There's no need for this function since it is used only once.

Signed-off-by: Borislav Petkov <petkovbb@gmail.com>
---
 drivers/ide/ide-floppy.c |   11 +++--------
 1 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/drivers/ide/ide-floppy.c b/drivers/ide/ide-floppy.c
index ffebf83..615d3a3 100644
--- a/drivers/ide/ide-floppy.c
+++ b/drivers/ide/ide-floppy.c
@@ -569,13 +569,6 @@ static void idefloppy_create_start_stop_cmd(struct ide_atapi_pc *pc, int start,
 	cmd[4] = start;
 }
 
-static void idefloppy_create_test_unit_ready_cmd(struct ide_atapi_pc *pc,
-						 unsigned char *cmd)
-{
-	idefloppy_init_pc(pc, cmd);
-	cmd[0] = GPCMD_TEST_UNIT_READY;
-}
-
 static void idefloppy_create_rw_cmd(idefloppy_floppy_t *floppy,
 				    struct ide_atapi_pc *pc, struct request *rq,
 				    unsigned long sector)
@@ -1161,7 +1154,9 @@ static int idefloppy_open(struct inode *inode, struct file *filp)
 		floppy->flags &= ~IDEFLOPPY_FLAG_FORMAT_IN_PROGRESS;
 		/* Just in case */
 
-		idefloppy_create_test_unit_ready_cmd(&pc, cmd);
+		idefloppy_init_pc(&pc, cmd);
+		cmd[0] = GPCMD_TEST_UNIT_READY;
+
 		if (idefloppy_queue_pc_tail(drive, &pc, cmd)) {
 			idefloppy_create_start_stop_cmd(&pc, 1, cmd);
 			(void) idefloppy_queue_pc_tail(drive, &pc, cmd);
-- 
1.5.5.1

--
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
[PATCH 00/18] misc generic ide stuff, Borislav Petkov, (Wed Jun 11, 11:40 pm)
[PATCH 01/18] ide-cd: remove wait-for-idle-controller bit ..., Borislav Petkov, (Wed Jun 11, 11:40 pm)
[PATCH 07/18] ide-cd: mv ide_do_rw_cdrom ide_cd_do_request, Borislav Petkov, (Wed Jun 11, 11:40 pm)
[PATCH 08/18] ide-cd: simplify request issuing path, Borislav Petkov, (Wed Jun 11, 11:41 pm)
[PATCH 13/18] ide-floppy: replace pc-&gt;c with rq-&gt;cmd, Borislav Petkov, (Wed Jun 11, 11:41 pm)
[PATCH 14/18] ide-floppy: fold idefloppy_create_test_unit_ ..., Borislav Petkov, (Wed Jun 11, 11:41 pm)
[PATCH 17/18] ide-floppy: cleanup idefloppy_create_rw_cmd, Borislav Petkov, (Wed Jun 11, 11:41 pm)
[PATCH 18/18] ide: use flags in IRQ handler, Borislav Petkov, (Wed Jun 11, 11:41 pm)
Re: [PATCH 00/18] misc generic ide stuff, Bartlomiej Zolnierki ..., (Sat Jun 14, 10:29 am)
Re: [PATCH 02/18] ide-cd: remove ide_cd_drain_data and ide ..., Bartlomiej Zolnierki ..., (Sat Jun 14, 10:29 am)
Re: [PATCH 03/18] ide-cd: cdrom_decode_status: factor out ..., Bartlomiej Zolnierki ..., (Sat Jun 14, 10:29 am)
Re: [PATCH 13/18] ide-floppy: replace pc-&gt;c with rq-&gt;cmd, Bartlomiej Zolnierki ..., (Sat Jun 14, 10:40 am)
Re: [PATCH 18/18] ide: use flags in IRQ handler, Bartlomiej Zolnierki ..., (Sat Jun 14, 10:47 am)
Re: [PATCH 00/18] misc generic ide stuff, Borislav Petkov, (Sun Jun 15, 3:27 am)
Re: [PATCH 13/18] ide-floppy: replace pc-&gt;c with rq-&gt;cmd, Bartlomiej Zolnierki ..., (Sun Jun 15, 7:57 am)
Re: [PATCH 03/18] ide-cd: cdrom_decode_status: factor out ..., Borislav Petkov, (Fri Aug 15, 12:34 am)
Re: [PATCH 03/18] ide-cd: cdrom_decode_status: factor out ..., Borislav Petkov, (Fri Aug 15, 12:34 am)