| Message ID | 1289034412-24278-3-git-send-email-jslaby@suse.cz |
|---|---|
| State | Accepted |
| Delegated to: | David Miller |
| Headers | show |
Hello. On 06-11-2010 12:06, Jiri Slaby wrote: > Stanse founf that rq in ide_floppy_callback cannot be NULL, because it found? > is dereferenced all around. So remove the superfluous check. > This appeared after blk_* macors removal. macros? > Signed-off-by: Jiri Slaby<jslaby@suse.cz> > Cc: Christoph Hellwig<hch@lst.de> > Cc: "David S. Miller"<davem@davemloft.net> > Cc: linux-ide@vger.kernel.org MBR, Sergei -- To unsubscribe from this list: send the line "unsubscribe linux-ide" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Sat, Nov 06, 2010 at 10:06:51AM +0100, Jiri Slaby wrote: > Stanse founf that rq in ide_floppy_callback cannot be NULL, because it > is dereferenced all around. So remove the superfluous check. > > This appeared after blk_* macors removal. > > Signed-off-by: Jiri Slaby <jslaby@suse.cz> > Cc: Christoph Hellwig <hch@lst.de> > Cc: "David S. Miller" <davem@davemloft.net> > Cc: linux-ide@vger.kernel.org > --- > drivers/ide/ide-floppy.c | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/drivers/ide/ide-floppy.c b/drivers/ide/ide-floppy.c > index 5406b6e..536ff68 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) { If this isn't a fix for a real bug, then there's no need for it since IDE is deprecated and thus in bugfix mode only.
From: Jiri Slaby <jslaby@suse.cz> Date: Sat, 6 Nov 2010 10:06:51 +0100 > Stanse founf that rq in ide_floppy_callback cannot be NULL, because it > is dereferenced all around. So remove the superfluous check. > > This appeared after blk_* macors removal. > > Signed-off-by: Jiri Slaby <jslaby@suse.cz> Applied with commit message typos fixed. Thanks. -- To unsubscribe from this list: send the line "unsubscribe linux-ide" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/ide/ide-floppy.c b/drivers/ide/ide-floppy.c index 5406b6e..536ff68 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) {
Stanse founf that rq in ide_floppy_callback cannot be NULL, because it is dereferenced all around. So remove the superfluous check. This appeared after blk_* macors removal. Signed-off-by: Jiri Slaby <jslaby@suse.cz> Cc: Christoph Hellwig <hch@lst.de> Cc: "David S. Miller" <davem@davemloft.net> Cc: linux-ide@vger.kernel.org --- drivers/ide/ide-floppy.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)