gpio: 74xx-mmio: Use devm_gpiochip_add_data() for gpio registration

[mirror_ubuntu-zesty-kernel.git] / drivers / scsi / scsi_debug.c

diff --git a/drivers/scsi/scsi_debug.c b/drivers/scsi/scsi_debug.c
index d09d60293c272663b5b9b84f27ce2fab3e61a6aa..f3d69a98c72521b39696ca6a688b3163f8288197 100644 (file)
--- a/drivers/scsi/scsi_debug.c
+++ b/drivers/scsi/scsi_debug.c
@@ -129,7 +129,7 @@ static const char *scsi_debug_version_date = "20141022";
 #define DEF_NO_LUN_0   0
 #define DEF_NUM_PARTS   0
 #define DEF_OPTS   0
-#define DEF_OPT_BLKS 64
+#define DEF_OPT_BLKS 1024
 #define DEF_PHYSBLK_EXP 0
 #define DEF_PTYPE   0
 #define DEF_REMOVABLE false
@@ -679,7 +679,7 @@ static void *fake_store(unsigned long long lba)
 
 static struct sd_dif_tuple *dif_store(sector_t sector)
 {
-       sector = do_div(sector, sdebug_store_sectors);
+       sector = sector_div(sector, sdebug_store_sectors);
 
        return dif_storep + sector;
 }
@@ -2781,7 +2781,7 @@ static unsigned long lba_to_map_index(sector_t lba)
                lba += scsi_debug_unmap_granularity -
                        scsi_debug_unmap_alignment;
        }
-       do_div(lba, scsi_debug_unmap_granularity);
+       sector_div(lba, scsi_debug_unmap_granularity);
 
        return lba;
 }
@@ -4140,7 +4140,7 @@ MODULE_PARM_DESC(no_lun_0, "no LU number 0 (def=0 -> have lun 0)");
 MODULE_PARM_DESC(no_uld, "stop ULD (e.g. sd driver) attaching (def=0))");
 MODULE_PARM_DESC(num_parts, "number of partitions(def=0)");
 MODULE_PARM_DESC(num_tgts, "number of targets per host to simulate(def=1)");
-MODULE_PARM_DESC(opt_blks, "optimal transfer length in block (def=64)");
+MODULE_PARM_DESC(opt_blks, "optimal transfer length in blocks (def=1024)");
 MODULE_PARM_DESC(opts, "1->noise, 2->medium_err, 4->timeout, 8->recovered_err... (def=0)");
 MODULE_PARM_DESC(physblk_exp, "physical block exponent (def=0)");
 MODULE_PARM_DESC(ptype, "SCSI peripheral type(def=0[disk])");
@@ -4847,10 +4847,10 @@ static int __init scsi_debug_init(void)
        /* play around with geometry, don't waste too much on track 0 */
        sdebug_heads = 8;
        sdebug_sectors_per = 32;
-       if (scsi_debug_dev_size_mb >= 16)
-               sdebug_heads = 32;
-       else if (scsi_debug_dev_size_mb >= 256)
+       if (scsi_debug_dev_size_mb >= 256)
                sdebug_heads = 64;
+       else if (scsi_debug_dev_size_mb >= 16)
+               sdebug_heads = 32;
        sdebug_cylinders_per = (unsigned long)sdebug_capacity /
                               (sdebug_sectors_per * sdebug_heads);
        if (sdebug_cylinders_per >= 1024) {