From: Jiri Slaby <jslaby@suse.cz>
Date: Mon, 22 Nov 2010 19:39:30 +0000 (-0800)
Subject: IDE: ide-floppy, remove unnecessary NULL check
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=f17bfe79e6aa34aecbd579258a5c55a790807aca;p=deliverable%2Flinux.git

IDE: ide-floppy, remove unnecessary NULL check

Stanse found that rq in ide_floppy_callback cannot be NULL, because it
is dereferenced all around. So remove the superfluous check.

This appeared after blk_* macros removal.

Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/drivers/ide/ide-floppy.c b/drivers/ide/ide-floppy.c
index 5406b6ea3ad1..536ff68062ab 100644
--- a/drivers/ide/ide-floppy.c
+++ b/drivers/ide/ide-floppy.c
@@ -73,7 +73,7 @@ static int ide_floppy_callback(ide_drive_t *drive, int dsc)
 		drive->failed_pc = NULL;
 
 	if (pc->c[0] == GPCMD_READ_10 || pc->c[0] == GPCMD_WRITE_10 ||
-	    (rq && rq->cmd_type == REQ_TYPE_BLOCK_PC))
+	    rq->cmd_type == REQ_TYPE_BLOCK_PC)
 		uptodate = 1; /* FIXME */
 	else if (pc->c[0] == GPCMD_REQUEST_SENSE) {