ide-atapi: use local sense buffer

Access the sense buffer through the bio in ->pc_callback method thus
alleviating the need for the pc->buf pointer.

There should be no functional change resulting from this patch.

Signed-off-by: Borislav Petkov <petkovbb@gmail.com>

3 files changed, 8 insertions, 4 deletions

diff --git a/drivers/ide/ide-atapi.c b/drivers/ide/ide-atapi.c
index b12be1f17f1..66ea1e7774f 100644
--- a/drivers/ide/ide-atapi.c
+++ b/drivers/ide/ide-atapi.c
@@ -253,7 +253,9 @@ void ide_retry_pc(ide_drive_t *drive)
         /* init pc from sense_rq */
         ide_init_pc(pc);
         memcpy(pc->c, sense_rq->cmd, 12);
-        pc->buf = bio_data(sense_rq->bio);      /* pointer to mapped address */
+
+        /* pointer to mapped address */
+        pc->buf = bio_data(sense_rq->bio);
         pc->req_xfer = blk_rq_bytes(sense_rq);
 
         if (drive->media == ide_tape)
diff --git a/drivers/ide/ide-floppy.c b/drivers/ide/ide-floppy.c
index 060c893820c..14e5e9ca2ad 100644
--- a/drivers/ide/ide-floppy.c
+++ b/drivers/ide/ide-floppy.c
@@ -77,7 +77,8 @@ static int ide_floppy_callback(ide_drive_t *drive, int dsc)
             (rq && blk_pc_request(rq)))
                 uptodate = 1; /* FIXME */
         else if (pc->c[0] == GPCMD_REQUEST_SENSE) {
-                u8 *buf = pc->buf;
+
+                u8 *buf = bio_data(rq->bio);
 
                 if (!pc->error) {
                         floppy->sense_key = buf[2] & 0x0F;
diff --git a/drivers/ide/ide-tape.c b/drivers/ide/ide-tape.c
index 1f7f50473a4..ef5f3429143 100644
--- a/drivers/ide/ide-tape.c
+++ b/drivers/ide/ide-tape.c
@@ -288,11 +288,12 @@ static struct ide_tape_obj *ide_tape_chrdev_get(unsigned int i)
  * called on each failed packet command retry to analyze the request sense. We
  * currently do not utilize this information.
  */
-static void idetape_analyze_error(ide_drive_t *drive, u8 *sense)
+static void idetape_analyze_error(ide_drive_t *drive)
 {
         idetape_tape_t *tape = drive->driver_data;
         struct ide_atapi_pc *pc = drive->failed_pc;
         struct request *rq = drive->hwif->rq;
+        u8 *sense = bio_data(rq->bio);
 
         tape->sense_key = sense[2] & 0xF;
         tape->asc       = sense[12];
@@ -362,7 +363,7 @@ static int ide_tape_callback(ide_drive_t *drive, int dsc)
 
         if (pc->c[0] == REQUEST_SENSE) {
                 if (uptodate)
-                        idetape_analyze_error(drive, pc->buf);
+                        idetape_analyze_error(drive);
                 else
                         printk(KERN_ERR "ide-tape: Error in REQUEST SENSE "
                                         "itself - Aborting request!\n");