i40e: Implement ndo_features_check()

[deliverable/linux.git] / drivers / scsi / scsi_debug.c

diff --git a/drivers/scsi/scsi_debug.c b/drivers/scsi/scsi_debug.c
index 1f8e2dc9c616a0b7e02559537c05b109123b5b80..30268bb2ddb6a3e78dc114606ed8c0b4b615d54a 100644 (file)
--- a/drivers/scsi/scsi_debug.c
+++ b/drivers/scsi/scsi_debug.c
@@ -2363,17 +2363,13 @@ do_device_access(struct scsi_cmnd *scmd, u64 lba, u32 num, bool do_write)
        u64 block, rest = 0;
        struct scsi_data_buffer *sdb;
        enum dma_data_direction dir;
-       size_t (*func)(struct scatterlist *, unsigned int, void *, size_t,
-                      off_t);
 
        if (do_write) {
                sdb = scsi_out(scmd);
                dir = DMA_TO_DEVICE;
-               func = sg_pcopy_to_buffer;
        } else {
                sdb = scsi_in(scmd);
                dir = DMA_FROM_DEVICE;
-               func = sg_pcopy_from_buffer;
        }
 
        if (!sdb->length)
@@ -2385,16 +2381,16 @@ do_device_access(struct scsi_cmnd *scmd, u64 lba, u32 num, bool do_write)
        if (block + num > sdebug_store_sectors)
                rest = block + num - sdebug_store_sectors;
 
-       ret = func(sdb->table.sgl, sdb->table.nents,
+       ret = sg_copy_buffer(sdb->table.sgl, sdb->table.nents,
                   fake_storep + (block * scsi_debug_sector_size),
-                  (num - rest) * scsi_debug_sector_size, 0);
+                  (num - rest) * scsi_debug_sector_size, 0, do_write);
        if (ret != (num - rest) * scsi_debug_sector_size)
                return ret;
 
        if (rest) {
-               ret += func(sdb->table.sgl, sdb->table.nents,
+               ret += sg_copy_buffer(sdb->table.sgl, sdb->table.nents,
                            fake_storep, rest * scsi_debug_sector_size,
-                           (num - rest) * scsi_debug_sector_size);
+                           (num - rest) * scsi_debug_sector_size, do_write);
        }
 
        return ret;