Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-13 07:31:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

mtd: rawnand: timings: Make onfi_fill_interface_config() a void helper

Browse Source 
Warn the user if the parameters are wrong but basically it would mean
there is a serious issue in the NAND core. So no need to ever check
its output, let's make this helper return void.

Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
Reviewed-by: Boris Brezillon <boris.brezillon@collabora.com>
Link: https://lore.kernel.org/linux-mtd/20200529111322.7184-21-miquel.raynal@bootlin.com
This commit is contained in:
Miquel Raynal 2020-05-29 13:13:14 +02:00
parent 4c46667b3d
commit 42a9ad050e
3 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/mtd/nand/raw/internals.h
View File

@ -84,10 +84,10 @@ int nand_bbm_get_next_page(struct nand_chip *chip, int page);
int nand_markbad_bbm(struct nand_chip *chip, loff_t ofs);
int nand_erase_nand(struct nand_chip *chip, struct erase_info *instr,
int allowbbt);
int onfi_fill_interface_config(struct nand_chip *chip,
struct nand_interface_config *iface,
enum nand_interface_type type,
unsigned int timing_mode);
void onfi_fill_interface_config(struct nand_chip *chip,
struct nand_interface_config *iface,
enum nand_interface_type type,
unsigned int timing_mode);
unsigned int
onfi_find_closest_sdr_mode(const struct nand_sdr_timings *spec_timings);
int nand_get_features(struct nand_chip *chip, int addr, u8 *subfeature_param);

6
drivers/mtd/nand/raw/nand_base.c
View File

@ -1041,10 +1041,8 @@ static int nand_choose_interface_config(struct nand_chip *chip)
}
for (mode = fls(modes) - 1; mode >= 0; mode--) {
ret = onfi_fill_interface_config(chip, &chip->interface_config,
NAND_SDR_IFACE, mode);
if (ret)
continue;
onfi_fill_interface_config(chip, &chip->interface_config,
NAND_SDR_IFACE, mode);
/*
* Pass NAND_DATA_IFACE_CHECK_ONLY to only check if the

18
drivers/mtd/nand/raw/nand_timings.c
View File

@ -347,18 +347,18 @@ onfi_find_closest_sdr_mode(const struct nand_sdr_timings *spec_timings)
* @type: The interface type
* @timing_mode: The ONFI timing mode
*/
int onfi_fill_interface_config(struct nand_chip *chip,
struct nand_interface_config *iface,
enum nand_interface_type type,
unsigned int timing_mode)
void onfi_fill_interface_config(struct nand_chip *chip,
struct nand_interface_config *iface,
enum nand_interface_type type,
unsigned int timing_mode)
{
struct onfi_params *onfi = chip->parameters.onfi;
if (type != NAND_SDR_IFACE)
return -EINVAL;
if (WARN_ON(type != NAND_SDR_IFACE))
return;
if (timing_mode >= ARRAY_SIZE(onfi_sdr_timings))
return -EINVAL;
if (WARN_ON(timing_mode >= ARRAY_SIZE(onfi_sdr_timings)))
return;
*iface = onfi_sdr_timings[timing_mode];
@ -378,6 +378,4 @@ int onfi_fill_interface_config(struct nand_chip *chip,
/* nanoseconds -> picoseconds */
timings->tCCS_min = 1000UL * onfi->tCCS;
}
return 0;
}