Browse Source

[MTD] Use DIV_ROUND_UP

The kernel.h macro DIV_ROUND_UP performs the computation (((n) + (d) - 1) /
(d)) but is perhaps more readable.

Signed-off-by: Julia Lawall <julia@diku.dk>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Julia Lawall 17 years ago
parent
commit
c8872b069c
3 changed files with 3 additions and 4 deletions
  1. 1 1
      drivers/mtd/chips/cfi_cmdset_0001.c
  2. 1 1
      drivers/mtd/chips/gen_probe.c
  3. 1 2
      drivers/mtd/ssfdc.c

+ 1 - 1
drivers/mtd/chips/cfi_cmdset_0001.c

@@ -1640,7 +1640,7 @@ static int __xipram do_write_buffer(struct map_info *map, struct flchip *chip,
 
 
 	/* Figure out the number of words to write */
 	/* Figure out the number of words to write */
 	word_gap = (-adr & (map_bankwidth(map)-1));
 	word_gap = (-adr & (map_bankwidth(map)-1));
-	words = (len - word_gap + map_bankwidth(map) - 1) / map_bankwidth(map);
+	words = DIV_ROUND_UP(len - word_gap, map_bankwidth(map));
 	if (!word_gap) {
 	if (!word_gap) {
 		words--;
 		words--;
 	} else {
 	} else {

+ 1 - 1
drivers/mtd/chips/gen_probe.c

@@ -111,7 +111,7 @@ static struct cfi_private *genprobe_ident_chips(struct map_info *map, struct chi
 		max_chips = 1;
 		max_chips = 1;
 	}
 	}
 
 
-	mapsize = sizeof(long) * ( (max_chips + BITS_PER_LONG-1) / BITS_PER_LONG );
+	mapsize = sizeof(long) * DIV_ROUND_UP(max_chips, BITS_PER_LONG);
 	chip_map = kzalloc(mapsize, GFP_KERNEL);
 	chip_map = kzalloc(mapsize, GFP_KERNEL);
 	if (!chip_map) {
 	if (!chip_map) {
 		printk(KERN_WARNING "%s: kmalloc failed for CFI chip map\n", map->name);
 		printk(KERN_WARNING "%s: kmalloc failed for CFI chip map\n", map->name);

+ 1 - 2
drivers/mtd/ssfdc.c

@@ -321,8 +321,7 @@ static void ssfdcr_add_mtd(struct mtd_blktrans_ops *tr, struct mtd_info *mtd)
 	DEBUG(MTD_DEBUG_LEVEL1,
 	DEBUG(MTD_DEBUG_LEVEL1,
 		"SSFDC_RO: cis_block=%d,erase_size=%d,map_len=%d,n_zones=%d\n",
 		"SSFDC_RO: cis_block=%d,erase_size=%d,map_len=%d,n_zones=%d\n",
 		ssfdc->cis_block, ssfdc->erase_size, ssfdc->map_len,
 		ssfdc->cis_block, ssfdc->erase_size, ssfdc->map_len,
-		(ssfdc->map_len + MAX_PHYS_BLK_PER_ZONE - 1) /
-		MAX_PHYS_BLK_PER_ZONE);
+		DIV_ROUND_UP(ssfdc->map_len, MAX_PHYS_BLK_PER_ZONE));
 
 
 	/* Set geometry */
 	/* Set geometry */
 	ssfdc->heads = 16;
 	ssfdc->heads = 16;