IDE: ide-floppy, remove unnecessary NULL check
authorJiri Slaby <jslaby@suse.cz>
Mon, 22 Nov 2010 19:39:30 +0000 (11:39 -0800)
committerDavid S. Miller <davem@davemloft.net>
Mon, 22 Nov 2010 19:39:30 +0000 (11:39 -0800)
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>
drivers/ide/ide-floppy.c

index 5406b6e..536ff68 100644 (file)
@@ -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) {