cxgb4vf: Fix queue allocation for 40G adapter

[firefly-linux-kernel-4.4.55.git] / drivers / block / swim3.c

diff --git a/drivers/block/swim3.c b/drivers/block/swim3.c
index c74f7b56e7c40106ddd5ebde357d161cf7929361..523ee8fd4c150e7671ab776368e8a0a017d3287e 100644 (file)
--- a/drivers/block/swim3.c
+++ b/drivers/block/swim3.c
@@ -342,7 +342,7 @@ static void start_request(struct floppy_state *fs)
                swim3_dbg("do_fd_req: dev=%s cmd=%d sec=%ld nr_sec=%u buf=%p\n",
                          req->rq_disk->disk_name, req->cmd,
                          (long)blk_rq_pos(req), blk_rq_sectors(req),
-                         req->buffer);
+                         bio_data(req->bio));
                swim3_dbg("           errors=%d current_nr_sectors=%u\n",
                          req->errors, blk_rq_cur_sectors(req));
 #endif
@@ -479,11 +479,11 @@ static inline void setup_transfer(struct floppy_state *fs)
                /* Set up 3 dma commands: write preamble, data, postamble */
                init_dma(cp, OUTPUT_MORE, write_preamble, sizeof(write_preamble));
                ++cp;
-               init_dma(cp, OUTPUT_MORE, req->buffer, 512);
+               init_dma(cp, OUTPUT_MORE, bio_data(req->bio), 512);
                ++cp;
                init_dma(cp, OUTPUT_LAST, write_postamble, sizeof(write_postamble));
        } else {
-               init_dma(cp, INPUT_LAST, req->buffer, n * 512);
+               init_dma(cp, INPUT_LAST, bio_data(req->bio), n * 512);
        }
        ++cp;
        out_le16(&cp->command, DBDMA_STOP);