From: Tudor Ambarus Date: Wed, 28 Aug 2019 10:35:17 +0000 (+0000) Subject: mtd: spi-nor: remove superfluous pass of nor->info->sector_size X-Git-Tag: v5.4-rc1~87^2~12^2~2 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=3a960339e08e168c03f0587b788f05fadf4e396d;p=linux.git mtd: spi-nor: remove superfluous pass of nor->info->sector_size We already pass a pointer to nor, we can obtain the sector_size by dereferencing it. Signed-off-by: Tudor Ambarus Reviewed-by: Vignesh Raghavendra --- diff --git a/drivers/mtd/spi-nor/spi-nor.c b/drivers/mtd/spi-nor/spi-nor.c index 6a2fff0598af..c6ebfbe25a73 100644 --- a/drivers/mtd/spi-nor/spi-nor.c +++ b/drivers/mtd/spi-nor/spi-nor.c @@ -4257,11 +4257,12 @@ spi_nor_select_uniform_erase(struct spi_nor_erase_map *map, return erase; } -static int spi_nor_select_erase(struct spi_nor *nor, u32 wanted_size) +static int spi_nor_select_erase(struct spi_nor *nor) { struct spi_nor_erase_map *map = &nor->params.erase_map; const struct spi_nor_erase_type *erase = NULL; struct mtd_info *mtd = &nor->mtd; + u32 wanted_size = nor->info->sector_size; int i; /* @@ -4355,7 +4356,7 @@ static int spi_nor_default_setup(struct spi_nor *nor, } /* Select the Sector Erase command. */ - err = spi_nor_select_erase(nor, nor->info->sector_size); + err = spi_nor_select_erase(nor); if (err) { dev_err(nor->dev, "can't select erase settings supported by both the SPI controller and memory.\n");