Commit 4c46667b authored by Miquel Raynal's avatar Miquel Raynal
Browse files

mtd: rawnand: s/data_interface/interface_config/ 



The name/suffix data_interface is a bit misleading in that the field
or functions actually represent a configuration that can be applied by
the controller/chip. Let's rename all fields/functions/hooks that are
worth renaming.

Signed-off-by: default avatarBoris Brezillon <boris.brezillon@collabora.com>
Signed-off-by: default avatarMiquel Raynal <miquel.raynal@bootlin.com>
parent e0160cd4

drivers/mtd/nand/raw/ams-delta.c

+3 −3
Original line number Diff line number Diff line
@@ -191,8 +191,8 @@ static int gpio_nand_exec_op(struct nand_chip *this, 
	return ret;

}



static int gpio_nand_setup_data_interface(struct nand_chip *this, int csline,

					  const struct nand_data_interface *cf)

static int gpio_nand_setup_interface(struct nand_chip *this, int csline,

				     const struct nand_interface_config *cf)

{

	struct gpio_nand *priv = nand_get_controller_data(this);

	const struct nand_sdr_timings *sdr = nand_get_sdr_timings(cf);
@@ -217,7 +217,7 @@ static int gpio_nand_setup_data_interface(struct nand_chip *this, int csline, 


static const struct nand_controller_ops gpio_nand_ops = {

	.exec_op = gpio_nand_exec_op,

	.setup_data_interface = gpio_nand_setup_data_interface,

	.setup_interface = gpio_nand_setup_interface,

};



/*

drivers/mtd/nand/raw/arasan-nand-controller.c

+3 −3
Original line number Diff line number Diff line
@@ -854,8 +854,8 @@ static int anfc_exec_op(struct nand_chip *chip, 
	return nand_op_parser_exec_op(chip, &anfc_op_parser, op, check_only);

}



static int anfc_setup_data_interface(struct nand_chip *chip, int target,

				     const struct nand_data_interface *conf)

static int anfc_setup_interface(struct nand_chip *chip, int target,

				const struct nand_interface_config *conf)

{

	struct anand *anand = to_anand(chip);

	struct arasan_nfc *nfc = to_anfc(chip->controller);
@@ -1083,7 +1083,7 @@ static void anfc_detach_chip(struct nand_chip *chip) 


static const struct nand_controller_ops anfc_ops = {

	.exec_op = anfc_exec_op,

	.setup_data_interface = anfc_setup_data_interface,

	.setup_interface = anfc_setup_interface,

	.attach_chip = anfc_attach_chip,

	.detach_chip = anfc_detach_chip,

};

drivers/mtd/nand/raw/atmel/nand-controller.c

+17 −17
Original line number Diff line number Diff line
@@ -200,8 +200,8 @@ struct atmel_nand_controller_ops { 
	void (*nand_init)(struct atmel_nand_controller *nc,

			  struct atmel_nand *nand);

	int (*ecc_init)(struct nand_chip *chip);

	int (*setup_data_interface)(struct atmel_nand *nand, int csline,

				    const struct nand_data_interface *conf);

	int (*setup_interface)(struct atmel_nand *nand, int csline,

			       const struct nand_interface_config *conf);

};



struct atmel_nand_controller_caps {
@@ -1168,7 +1168,7 @@ static int atmel_hsmc_nand_ecc_init(struct nand_chip *chip) 
}



static int atmel_smc_nand_prepare_smcconf(struct atmel_nand *nand,

					const struct nand_data_interface *conf,

					const struct nand_interface_config *conf,

					struct atmel_smc_cs_conf *smcconf)

{

	u32 ncycles, totalcycles, timeps, mckperiodps;
@@ -1397,9 +1397,9 @@ static int atmel_smc_nand_prepare_smcconf(struct atmel_nand *nand, 
	return 0;

}



static int atmel_smc_nand_setup_data_interface(struct atmel_nand *nand,

static int atmel_smc_nand_setup_interface(struct atmel_nand *nand,

					int csline,

					const struct nand_data_interface *conf)

					const struct nand_interface_config *conf)

{

	struct atmel_nand_controller *nc;

	struct atmel_smc_cs_conf smcconf;
@@ -1422,9 +1422,9 @@ static int atmel_smc_nand_setup_data_interface(struct atmel_nand *nand, 
	return 0;

}



static int atmel_hsmc_nand_setup_data_interface(struct atmel_nand *nand,

static int atmel_hsmc_nand_setup_interface(struct atmel_nand *nand,

					int csline,

					const struct nand_data_interface *conf)

					const struct nand_interface_config *conf)

{

	struct atmel_hsmc_nand_controller *nc;

	struct atmel_smc_cs_conf smcconf;
@@ -1452,8 +1452,8 @@ static int atmel_hsmc_nand_setup_data_interface(struct atmel_nand *nand, 
	return 0;

}



static int atmel_nand_setup_data_interface(struct nand_chip *chip, int csline,

					const struct nand_data_interface *conf)

static int atmel_nand_setup_interface(struct nand_chip *chip, int csline,

				      const struct nand_interface_config *conf)

{

	struct atmel_nand *nand = to_atmel_nand(chip);

	struct atmel_nand_controller *nc;
@@ -1464,7 +1464,7 @@ static int atmel_nand_setup_data_interface(struct nand_chip *chip, int csline, 
	    (csline < 0 && csline != NAND_DATA_IFACE_CHECK_ONLY))

		return -EINVAL;



	return nc->caps->ops->setup_data_interface(nand, csline, conf);

	return nc->caps->ops->setup_interface(nand, csline, conf);

}



static void atmel_nand_init(struct atmel_nand_controller *nc,
@@ -1483,7 +1483,7 @@ static void atmel_nand_init(struct atmel_nand_controller *nc, 
	chip->legacy.write_buf = atmel_nand_write_buf;

	chip->legacy.select_chip = atmel_nand_select_chip;



	if (!nc->mck || !nc->caps->ops->setup_data_interface)

	if (!nc->mck || !nc->caps->ops->setup_interface)

		chip->options |= NAND_KEEP_TIMINGS;



	/* Some NANDs require a longer delay than the default one (20us). */
@@ -1956,7 +1956,7 @@ static int atmel_nand_attach_chip(struct nand_chip *chip) 


static const struct nand_controller_ops atmel_nand_controller_ops = {

	.attach_chip = atmel_nand_attach_chip,

	.setup_data_interface = atmel_nand_setup_data_interface,

	.setup_interface = atmel_nand_setup_interface,

};



static int atmel_nand_controller_init(struct atmel_nand_controller *nc,
@@ -2318,7 +2318,7 @@ static const struct atmel_nand_controller_ops atmel_hsmc_nc_ops = { 
	.remove = atmel_hsmc_nand_controller_remove,

	.ecc_init = atmel_hsmc_nand_ecc_init,

	.nand_init = atmel_hsmc_nand_init,

	.setup_data_interface = atmel_hsmc_nand_setup_data_interface,

	.setup_interface = atmel_hsmc_nand_setup_interface,

};



static const struct atmel_nand_controller_caps atmel_sama5_nc_caps = {
@@ -2375,10 +2375,10 @@ atmel_smc_nand_controller_remove(struct atmel_nand_controller *nc) 


/*

 * The SMC reg layout of at91rm9200 is completely different which prevents us

 * from re-using atmel_smc_nand_setup_data_interface() for the

 * ->setup_data_interface() hook.

 * from re-using atmel_smc_nand_setup_interface() for the

 * ->setup_interface() hook.

 * At this point, there's no support for the at91rm9200 SMC IP, so we leave

 * ->setup_data_interface() unassigned.

 * ->setup_interface() unassigned.

 */

static const struct atmel_nand_controller_ops at91rm9200_nc_ops = {

	.probe = atmel_smc_nand_controller_probe,
@@ -2399,7 +2399,7 @@ static const struct atmel_nand_controller_ops atmel_smc_nc_ops = { 
	.remove = atmel_smc_nand_controller_remove,

	.ecc_init = atmel_nand_ecc_init,

	.nand_init = atmel_smc_nand_init,

	.setup_data_interface = atmel_smc_nand_setup_data_interface,

	.setup_interface = atmel_smc_nand_setup_interface,

};



static const struct atmel_nand_controller_caps atmel_sam9260_nc_caps = {

drivers/mtd/nand/raw/cadence-nand-controller.c

+3 −3
Original line number Diff line number Diff line
@@ -2303,8 +2303,8 @@ static inline u32 calc_tdvw(u32 trp_cnt, u32 clk_period, u32 trhoh_min, 
}



static int

cadence_nand_setup_data_interface(struct nand_chip *chip, int chipnr,

				  const struct nand_data_interface *conf)

cadence_nand_setup_interface(struct nand_chip *chip, int chipnr,

			     const struct nand_interface_config *conf)

{

	const struct nand_sdr_timings *sdr;

	struct cdns_nand_ctrl *cdns_ctrl = to_cdns_nand_ctrl(chip->controller);
@@ -2690,7 +2690,7 @@ static int cadence_nand_attach_chip(struct nand_chip *chip) 
static const struct nand_controller_ops cadence_nand_controller_ops = {

	.attach_chip = cadence_nand_attach_chip,

	.exec_op = cadence_nand_exec_op,

	.setup_data_interface = cadence_nand_setup_data_interface,

	.setup_interface = cadence_nand_setup_interface,

};



static int cadence_nand_chip_init(struct cdns_nand_ctrl *cdns_ctrl,

drivers/mtd/nand/raw/denali.c

+4 −4
Original line number Diff line number Diff line
@@ -761,8 +761,8 @@ static int denali_write_page(struct nand_chip *chip, const u8 *buf, 
	return denali_page_xfer(chip, (void *)buf, mtd->writesize, page, true);

}



static int denali_setup_data_interface(struct nand_chip *chip, int chipnr,

				       const struct nand_data_interface *conf)

static int denali_setup_interface(struct nand_chip *chip, int chipnr,

				  const struct nand_interface_config *conf)

{

	static const unsigned int data_setup_on_host = 10000;

	struct denali_controller *denali = to_denali_controller(chip);
@@ -1173,7 +1173,7 @@ static int denali_exec_op(struct nand_chip *chip, 
static const struct nand_controller_ops denali_controller_ops = {

	.attach_chip = denali_attach_chip,

	.exec_op = denali_exec_op,

	.setup_data_interface = denali_setup_data_interface,

	.setup_interface = denali_setup_interface,

};



int denali_chip_init(struct denali_controller *denali,
@@ -1230,7 +1230,7 @@ int denali_chip_init(struct denali_controller *denali, 
		chip->buf_align = 16;

	}



	/* clk rate info is needed for setup_data_interface */

	/* clk rate info is needed for setup_interface */

	if (!denali->clk_rate || !denali->clk_x_rate)

		chip->options |= NAND_KEEP_TIMINGS;