aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2024-05-02 11:24:41 +1000
committerStephen Rothwell <sfr@canb.auug.org.au>2024-05-02 11:24:41 +1000
commitb072f742028e58c277668c592b200e9ff80b1b36 (patch)
treeb3974aa747c8fb89b67e35c1c13151070fe5e01e
parent73c3001d43e7540fa0bc3862657b269e657562c7 (diff)
parentc84b3925c7d6c649f5add009084ff409139f894d (diff)
downloadlinux-next-history-b072f742028e58c277668c592b200e9ff80b1b36.tar.gz
Merge branch 'spi-nor/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git
Notice: this object is not reachable from any branch.
Notice: this object is not reachable from any branch.
-rw-r--r--drivers/mtd/spi-nor/core.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mtd/spi-nor/core.c b/drivers/mtd/spi-nor/core.c
index 3e1f1913536bf5..028514c6996f00 100644
--- a/drivers/mtd/spi-nor/core.c
+++ b/drivers/mtd/spi-nor/core.c
@@ -2893,7 +2893,7 @@ static int spi_nor_late_init_params(struct spi_nor *nor)
spi_nor_init_default_locking_ops(nor);
if (params->n_banks > 1)
- params->bank_size = div64_u64(params->size, params->n_banks);
+ params->bank_size = div_u64(params->size, params->n_banks);
return 0;
}
@@ -3406,7 +3406,7 @@ static int spi_nor_set_mtd_eraseregions(struct spi_nor *nor)
return -EINVAL;
mtd_region[i].erasesize = erasesize;
- mtd_region[i].numblocks = div64_ul(region[i].size, erasesize);
+ mtd_region[i].numblocks = div_u64(region[i].size, erasesize);
mtd_region[i].offset = region[i].offset;
}