torvalds/linux
torvalds/linux
2
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-09-04 20:19:47 +08:00
Code

mtd: rawnand: Pass a nand_chip object to chip->dev_ready()

Browse Source 
Let's make the raw NAND API consistent by patching all helpers and
hooks to take a nand_chip object instead of an mtd_info one or
remove the mtd_info object when both are passed.

Let's tackle the chip->dev_ready() hook.

Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com>
Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
This commit is contained in:
Boris Brezillon 2018-09-06 14:05:27 +02:00 committed by Miquel Raynal
parent 0f808c1602
commit 50a487e771
37 changed files with 68 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/mtd/nand/raw/ams-delta.c
View File

@ -130,7 +130,7 @@ static void ams_delta_hwcontrol(struct nand_chip *this, int cmd,
ams_delta_write_byte(this, cmd); ams_delta_write_byte(this, cmd);
} }
static int ams_delta_nand_ready(struct mtd_info *mtd) static int ams_delta_nand_ready(struct nand_chip *this)
{ {
return gpio_get_value(AMS_DELTA_GPIO_PIN_NAND_RB); return gpio_get_value(AMS_DELTA_GPIO_PIN_NAND_RB);
} }

6
drivers/mtd/nand/raw/atmel/nand-controller.c
View File

@ -475,9 +475,8 @@ static void atmel_nand_write_buf(struct nand_chip *chip, const u8 *buf, int len)
iowrite8_rep(nand->activecs->io.virt, buf, len); iowrite8_rep(nand->activecs->io.virt, buf, len);
} }
static int atmel_nand_dev_ready(struct mtd_info *mtd) static int atmel_nand_dev_ready(struct nand_chip *chip)
{ {
struct nand_chip *chip = mtd_to_nand(mtd);
struct atmel_nand *nand = to_atmel_nand(chip); struct atmel_nand *nand = to_atmel_nand(chip);
return gpiod_get_value(nand->activecs->rb.gpio); return gpiod_get_value(nand->activecs->rb.gpio);
@ -499,9 +498,8 @@ static void atmel_nand_select_chip(struct nand_chip *chip, int cs)
chip->dev_ready = atmel_nand_dev_ready; chip->dev_ready = atmel_nand_dev_ready;
} }
static int atmel_hsmc_nand_dev_ready(struct mtd_info *mtd) static int atmel_hsmc_nand_dev_ready(struct nand_chip *chip)
{ {
struct nand_chip *chip = mtd_to_nand(mtd);
struct atmel_nand *nand = to_atmel_nand(chip); struct atmel_nand *nand = to_atmel_nand(chip);
struct atmel_hsmc_nand_controller *nc; struct atmel_hsmc_nand_controller *nc;
u32 status; u32 status;

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

@ -213,7 +213,7 @@ static void au1550_hwcontrol(struct mtd_info *mtd, int cmd)
wmb(); /* Drain the writebuffer */ wmb(); /* Drain the writebuffer */
} }
int au1550_device_ready(struct mtd_info *mtd) int au1550_device_ready(struct nand_chip *this)
{ {
return (alchemy_rdsmem(AU1000_MEM_STSTAT) & 0x1) ? 1 : 0; return (alchemy_rdsmem(AU1000_MEM_STSTAT) & 0x1) ? 1 : 0;
} }
@ -341,7 +341,7 @@ static void au1550_command(struct mtd_info *mtd, unsigned command, int column, i
/* Apply a short delay always to ensure that we do wait tWB. */ /* Apply a short delay always to ensure that we do wait tWB. */
ndelay(100); ndelay(100);
/* Wait for a chip to become ready... */ /* Wait for a chip to become ready... */
for (i = this->chip_delay; !this->dev_ready(mtd) && i > 0; --i) for (i = this->chip_delay; !this->dev_ready(this) && i > 0; --i)
udelay(1); udelay(1);
/* Release -CE and re-enable interrupts. */ /* Release -CE and re-enable interrupts. */
@ -352,7 +352,7 @@ static void au1550_command(struct mtd_info *mtd, unsigned command, int column, i
/* Apply this short delay always to ensure that we do wait tWB. */ /* Apply this short delay always to ensure that we do wait tWB. */
ndelay(100); ndelay(100);
while(!this->dev_ready(mtd)); while(!this->dev_ready(this));
} }
static int find_nand_cs(unsigned long nand_base) static int find_nand_cs(unsigned long nand_base)

3
drivers/mtd/nand/raw/bcm47xxnflash/ops_bcm4706.c
View File

@ -196,9 +196,8 @@ static void bcm47xxnflash_ops_bcm4706_select_chip(struct nand_chip *chip,
return; return;
} }
static int bcm47xxnflash_ops_bcm4706_dev_ready(struct mtd_info *mtd) static int bcm47xxnflash_ops_bcm4706_dev_ready(struct nand_chip *nand_chip)
{ {
struct nand_chip *nand_chip = mtd_to_nand(mtd);
struct bcm47xxnflash *b47n = nand_get_controller_data(nand_chip); struct bcm47xxnflash *b47n = nand_get_controller_data(nand_chip);
return !!(bcma_cc_read32(b47n->cc, BCMA_CC_NFLASH_CTL) & NCTL_READY); return !!(bcma_cc_read32(b47n->cc, BCMA_CC_NFLASH_CTL) & NCTL_READY);

3
drivers/mtd/nand/raw/cafe_nand.c
View File

@ -100,9 +100,8 @@ static const char *part_probes[] = { "cmdlinepart", "RedBoot", NULL };
#define cafe_readl(cafe, addr) readl((cafe)->mmio + CAFE_##addr) #define cafe_readl(cafe, addr) readl((cafe)->mmio + CAFE_##addr)
#define cafe_writel(cafe, datum, addr) writel(datum, (cafe)->mmio + CAFE_##addr) #define cafe_writel(cafe, datum, addr) writel(datum, (cafe)->mmio + CAFE_##addr)
static int cafe_device_ready(struct mtd_info *mtd) static int cafe_device_ready(struct nand_chip *chip)
{ {
struct nand_chip *chip = mtd_to_nand(mtd);
struct cafe_priv *cafe = nand_get_controller_data(chip); struct cafe_priv *cafe = nand_get_controller_data(chip);
int result = !!(cafe_readl(cafe, NAND_STATUS) & 0x40000000); int result = !!(cafe_readl(cafe, NAND_STATUS) & 0x40000000);
uint32_t irqs = cafe_readl(cafe, NAND_IRQ); uint32_t irqs = cafe_readl(cafe, NAND_IRQ);

2
drivers/mtd/nand/raw/cmx270_nand.c
View File

@ -119,7 +119,7 @@ static void cmx270_hwcontrol(struct nand_chip *this, int dat,
/* /*
* read device ready pin * read device ready pin
*/ */
static int cmx270_device_ready(struct mtd_info *mtd) static int cmx270_device_ready(struct nand_chip *this)
{ {
dsb(); dsb();

3
drivers/mtd/nand/raw/cs553x_nand.c
View File

@ -141,9 +141,8 @@ static void cs553x_hwcontrol(struct nand_chip *this, int cmd,
cs553x_write_byte(this, cmd); cs553x_write_byte(this, cmd);
} }
static int cs553x_device_ready(struct mtd_info *mtd) static int cs553x_device_ready(struct nand_chip *this)
{ {
struct nand_chip *this = mtd_to_nand(mtd);
void __iomem *mmio_base = this->IO_ADDR_R; void __iomem *mmio_base = this->IO_ADDR_R;
unsigned char foo = readb(mmio_base + MM_NAND_STS); unsigned char foo = readb(mmio_base + MM_NAND_STS);

4
drivers/mtd/nand/raw/davinci_nand.c
View File

@ -460,9 +460,9 @@ static void nand_davinci_write_buf(struct nand_chip *chip, const uint8_t *buf,
* Check hardware register for wait status. Returns 1 if device is ready, * Check hardware register for wait status. Returns 1 if device is ready,
* 0 if it is still busy. * 0 if it is still busy.
*/ */
static int nand_davinci_dev_ready(struct mtd_info *mtd) static int nand_davinci_dev_ready(struct nand_chip *chip)
{ {
struct davinci_nand_info *info = to_davinci_nand(mtd); struct davinci_nand_info *info = to_davinci_nand(nand_to_mtd(chip));
return davinci_nand_readl(info, NANDFSR_OFFSET) & BIT(0); return davinci_nand_readl(info, NANDFSR_OFFSET) & BIT(0);
} }

4
drivers/mtd/nand/raw/denali.c
View File

@ -296,9 +296,9 @@ static void denali_cmd_ctrl(struct nand_chip *chip, int dat, unsigned int ctrl)
denali->host_write(denali, DENALI_BANK(denali) | type, dat); denali->host_write(denali, DENALI_BANK(denali) | type, dat);
} }
static int denali_dev_ready(struct mtd_info *mtd) static int denali_dev_ready(struct nand_chip *chip)
{ {
struct denali_nand_info *denali = mtd_to_denali(mtd); struct denali_nand_info *denali = mtd_to_denali(nand_to_mtd(chip));
return !!(denali_check_irq(denali) & INTR__INT_ACT); return !!(denali_check_irq(denali) & INTR__INT_ACT);
} }

5
drivers/mtd/nand/raw/diskonchip.c
View File

@ -739,12 +739,11 @@ static void doc2001plus_command(struct mtd_info *mtd, unsigned command, int colu
* any case on any machine. */ * any case on any machine. */
ndelay(100); ndelay(100);
/* wait until command is processed */ /* wait until command is processed */
while (!this->dev_ready(mtd)) ; while (!this->dev_ready(this)) ;
} }
static int doc200x_dev_ready(struct mtd_info *mtd) static int doc200x_dev_ready(struct nand_chip *this)
{ {
struct nand_chip *this = mtd_to_nand(mtd);
struct doc_priv *doc = nand_get_controller_data(this); struct doc_priv *doc = nand_get_controller_data(this);
void __iomem *docptr = doc->virtadr; void __iomem *docptr = doc->virtadr;

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

@ -52,9 +52,9 @@ static inline struct fsl_upm_nand *to_fsl_upm_nand(struct mtd_info *mtdinfo)
chip); chip);
} }
static int fun_chip_ready(struct mtd_info *mtd) static int fun_chip_ready(struct nand_chip *chip)
{ {
struct fsl_upm_nand *fun = to_fsl_upm_nand(mtd); struct fsl_upm_nand *fun = to_fsl_upm_nand(nand_to_mtd(chip));
if (gpio_get_value(fun->rnb_gpio[fun->mchip_number])) if (gpio_get_value(fun->rnb_gpio[fun->mchip_number]))
return 1; return 1;
@ -69,7 +69,7 @@ static void fun_wait_rnb(struct fsl_upm_nand *fun)
struct mtd_info *mtd = nand_to_mtd(&fun->chip); struct mtd_info *mtd = nand_to_mtd(&fun->chip);
int cnt = 1000000; int cnt = 1000000;
while (--cnt && !fun_chip_ready(mtd)) while (--cnt && !fun_chip_ready(&fun->chip))
cpu_relax(); cpu_relax();
if (!cnt) if (!cnt)
dev_err(fun->dev, "tired waiting for RNB\n"); dev_err(fun->dev, "tired waiting for RNB\n");

4
drivers/mtd/nand/raw/gpio.c
View File

@ -94,9 +94,9 @@ static void gpio_nand_cmd_ctrl(struct nand_chip *chip, int cmd,
gpio_nand_dosync(gpiomtd); gpio_nand_dosync(gpiomtd);
} }
static int gpio_nand_devready(struct mtd_info *mtd) static int gpio_nand_devready(struct nand_chip *chip)
{ {
struct gpiomtd *gpiomtd = gpio_nand_getpriv(mtd); struct gpiomtd *gpiomtd = gpio_nand_getpriv(nand_to_mtd(chip));
return gpiod_get_value(gpiomtd->rdy); return gpiod_get_value(gpiomtd->rdy);
} }

3
drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c
View File

@ -816,9 +816,8 @@ static void gpmi_cmd_ctrl(struct nand_chip *chip, int data, unsigned int ctrl)
this->command_length = 0; this->command_length = 0;
} }
static int gpmi_dev_ready(struct mtd_info *mtd) static int gpmi_dev_ready(struct nand_chip *chip)
{ {
struct nand_chip *chip = mtd_to_nand(mtd);
struct gpmi_nand_data *this = nand_get_controller_data(chip); struct gpmi_nand_data *this = nand_get_controller_data(chip);
return gpmi_is_ready(this, this->current_chip); return gpmi_is_ready(this, this->current_chip);

4
drivers/mtd/nand/raw/jz4740_nand.c
View File

@ -127,9 +127,9 @@ static void jz_nand_cmd_ctrl(struct nand_chip *chip, int dat,
writeb(dat, chip->IO_ADDR_W); writeb(dat, chip->IO_ADDR_W);
} }
static int jz_nand_dev_ready(struct mtd_info *mtd) static int jz_nand_dev_ready(struct nand_chip *chip)
{ {
struct jz_nand *nand = mtd_to_jz_nand(mtd); struct jz_nand *nand = mtd_to_jz_nand(nand_to_mtd(chip));
return gpiod_get_value_cansleep(nand->busy_gpio); return gpiod_get_value_cansleep(nand->busy_gpio);
} }

4
drivers/mtd/nand/raw/jz4780_nand.c
View File

@ -109,9 +109,9 @@ static void jz4780_nand_cmd_ctrl(struct nand_chip *chip, int cmd,
writeb(cmd, cs->base + OFFSET_CMD); writeb(cmd, cs->base + OFFSET_CMD);
} }
static int jz4780_nand_dev_ready(struct mtd_info *mtd) static int jz4780_nand_dev_ready(struct nand_chip *chip)
{ {
struct jz4780_nand_chip *nand = to_jz4780_nand_chip(mtd); struct jz4780_nand_chip *nand = to_jz4780_nand_chip(nand_to_mtd(chip));
return !gpiod_get_value_cansleep(nand->busy_gpio); return !gpiod_get_value_cansleep(nand->busy_gpio);
} }

3
drivers/mtd/nand/raw/lpc32xx_mlc.c
View File

@ -302,9 +302,8 @@ static void lpc32xx_nand_cmd_ctrl(struct nand_chip *nand_chip, int cmd,
/* /*
* Read Device Ready (NAND device _and_ controller ready) * Read Device Ready (NAND device _and_ controller ready)
*/ */
static int lpc32xx_nand_device_ready(struct mtd_info *mtd) static int lpc32xx_nand_device_ready(struct nand_chip *nand_chip)
{ {
struct nand_chip *nand_chip = mtd_to_nand(mtd);
struct lpc32xx_nand_host *host = nand_get_controller_data(nand_chip); struct lpc32xx_nand_host *host = nand_get_controller_data(nand_chip);
if ((readb(MLC_ISR(host->io_base)) & if ((readb(MLC_ISR(host->io_base)) &

3
drivers/mtd/nand/raw/lpc32xx_slc.c
View File

@ -303,9 +303,8 @@ static void lpc32xx_nand_cmd_ctrl(struct nand_chip *chip, int cmd,
/* /*
* Read the Device Ready pin * Read the Device Ready pin
*/ */
static int lpc32xx_nand_device_ready(struct mtd_info *mtd) static int lpc32xx_nand_device_ready(struct nand_chip *chip)
{ {
struct nand_chip *chip = mtd_to_nand(mtd);
struct lpc32xx_nand_host *host = nand_get_controller_data(chip); struct lpc32xx_nand_host *host = nand_get_controller_data(chip);
int rdy = 0; int rdy = 0;

2
drivers/mtd/nand/raw/mpc5121_nfc.c
View File

@ -320,7 +320,7 @@ static void ads5121_select_chip(struct nand_chip *nand, int chip)
} }
/* Read NAND Ready/Busy signal */ /* Read NAND Ready/Busy signal */
static int mpc5121_nfc_dev_ready(struct mtd_info *mtd) static int mpc5121_nfc_dev_ready(struct nand_chip *nand)
{ {
/* /*
* NFC handles ready/busy signal internally. Therefore, this function * NFC handles ready/busy signal internally. Therefore, this function

4
drivers/mtd/nand/raw/mtk_nand.c
View File

@ -402,9 +402,9 @@ static void mtk_nfc_select_chip(struct nand_chip *nand, int chip)
nfi_writel(nfc, mtk_nand->sels[chip], NFI_CSEL); nfi_writel(nfc, mtk_nand->sels[chip], NFI_CSEL);
} }
static int mtk_nfc_dev_ready(struct mtd_info *mtd) static int mtk_nfc_dev_ready(struct nand_chip *nand)
{ {
struct mtk_nfc *nfc = nand_get_controller_data(mtd_to_nand(mtd)); struct mtk_nfc *nfc = nand_get_controller_data(nand);
if (nfi_readl(nfc, NFI_STA) & STA_BUSY) if (nfi_readl(nfc, NFI_STA) & STA_BUSY)
return 0; return 0;

2
drivers/mtd/nand/raw/mxc_nand.c
View File

@ -701,7 +701,7 @@ static void mxc_nand_enable_hwecc_v3(struct nand_chip *chip, bool enable)
} }
/* This functions is used by upper layer to checks if device is ready */ /* This functions is used by upper layer to checks if device is ready */
static int mxc_nand_dev_ready(struct mtd_info *mtd) static int mxc_nand_dev_ready(struct nand_chip *chip)
{ {
/* /*
* NFC handles R/B internally. Therefore, this function * NFC handles R/B internally. Therefore, this function

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

@ -603,7 +603,7 @@ static void panic_nand_wait_ready(struct mtd_info *mtd, unsigned long timeo)
/* Wait for the device to get ready */ /* Wait for the device to get ready */
for (i = 0; i < timeo; i++) { for (i = 0; i < timeo; i++) {
if (chip->dev_ready(mtd)) if (chip->dev_ready(chip))
break; break;
touch_softlockup_watchdog(); touch_softlockup_watchdog();
mdelay(1); mdelay(1);
@ -627,12 +627,12 @@ void nand_wait_ready(struct nand_chip *chip)
/* Wait until command is processed or timeout occurs */ /* Wait until command is processed or timeout occurs */
timeo = jiffies + msecs_to_jiffies(timeo); timeo = jiffies + msecs_to_jiffies(timeo);
do { do {
if (chip->dev_ready(mtd)) if (chip->dev_ready(chip))
return; return;
cond_resched(); cond_resched();
} while (time_before(jiffies, timeo)); } while (time_before(jiffies, timeo));
if (!chip->dev_ready(mtd)) if (!chip->dev_ready(chip))
pr_warn_ratelimited("timeout while waiting for chip to become ready\n"); pr_warn_ratelimited("timeout while waiting for chip to become ready\n");
} }
EXPORT_SYMBOL_GPL(nand_wait_ready); EXPORT_SYMBOL_GPL(nand_wait_ready);
@ -1068,7 +1068,7 @@ static void panic_nand_wait(struct mtd_info *mtd, struct nand_chip *chip,
int i; int i;
for (i = 0; i < timeo; i++) { for (i = 0; i < timeo; i++) {
if (chip->dev_ready) { if (chip->dev_ready) {
if (chip->dev_ready(mtd)) if (chip->dev_ready(chip))
break; break;
} else { } else {
int ret; int ret;
@ -1116,7 +1116,7 @@ static int nand_wait(struct mtd_info *mtd, struct nand_chip *chip)
timeo = jiffies + msecs_to_jiffies(timeo); timeo = jiffies + msecs_to_jiffies(timeo);
do { do {
if (chip->dev_ready) { if (chip->dev_ready) {
if (chip->dev_ready(mtd)) if (chip->dev_ready(chip))
break; break;
} else { } else {
ret = nand_read_data_op(chip, &status, ret = nand_read_data_op(chip, &status,

2
drivers/mtd/nand/raw/nandsim.c
View File

@ -2099,7 +2099,7 @@ static void ns_hwcontrol(struct nand_chip *chip, int cmd, unsigned int bitmask)
ns_nand_write_byte(chip, cmd); ns_nand_write_byte(chip, cmd);
} }
static int ns_device_ready(struct mtd_info *mtd) static int ns_device_ready(struct nand_chip *chip)
{ {
NS_DBG("device_ready\n"); NS_DBG("device_ready\n");
return 1; return 1;

3
drivers/mtd/nand/raw/ndfc.c
View File

@ -71,9 +71,8 @@ static void ndfc_hwcontrol(struct nand_chip *chip, int cmd, unsigned int ctrl)
writel(cmd & 0xFF, ndfc->ndfcbase + NDFC_ALE); writel(cmd & 0xFF, ndfc->ndfcbase + NDFC_ALE);
} }
static int ndfc_ready(struct mtd_info *mtd) static int ndfc_ready(struct nand_chip *chip)
{ {
struct nand_chip *chip = mtd_to_nand(mtd);
struct ndfc_controller *ndfc = nand_get_controller_data(chip); struct ndfc_controller *ndfc = nand_get_controller_data(chip);
return in_be32(ndfc->ndfcbase + NDFC_STAT) & NDFC_STAT_IS_READY; return in_be32(ndfc->ndfcbase + NDFC_STAT) & NDFC_STAT_IS_READY;

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

@ -120,9 +120,9 @@ static int nuc900_check_rb(struct nuc900_nand *nand)
return val; return val;
} }
static int nuc900_nand_devready(struct mtd_info *mtd) static int nuc900_nand_devready(struct nand_chip *chip)
{ {
struct nuc900_nand *nand = mtd_to_nuc900(mtd); struct nuc900_nand *nand = mtd_to_nuc900(nand_to_mtd(chip));
int ready; int ready;
ready = (nuc900_check_rb(nand)) ? 1 : 0; ready = (nuc900_check_rb(nand)) ? 1 : 0;
@ -205,7 +205,7 @@ static void nuc900_nand_command_lp(struct mtd_info *mtd, unsigned int command,
* any case on any machine. */ * any case on any machine. */
ndelay(100); ndelay(100);
while (!chip->dev_ready(mtd)) while (!chip->dev_ready(chip))
; ;
} }

4
drivers/mtd/nand/raw/omap2.c
View File

@ -1021,9 +1021,9 @@ static int omap_wait(struct mtd_info *mtd, struct nand_chip *chip)
* *
* Returns true if ready and false if busy. * Returns true if ready and false if busy.
*/ */
static int omap_dev_ready(struct mtd_info *mtd) static int omap_dev_ready(struct nand_chip *chip)
{ {
struct omap_nand_info *info = mtd_to_omap(mtd); struct omap_nand_info *info = mtd_to_omap(nand_to_mtd(chip));
return gpiod_get_value(info->ready_gpiod); return gpiod_get_value(info->ready_gpiod);
} }

2
drivers/mtd/nand/raw/pasemi_nand.c
View File

@ -80,7 +80,7 @@ static void pasemi_hwcontrol(struct nand_chip *chip, int cmd,
inl(lpcctl); inl(lpcctl);
} }
int pasemi_device_ready(struct mtd_info *mtd) int pasemi_device_ready(struct nand_chip *chip)
{ {
return !!(inl(lpcctl) & LBICTRL_LPCCTL_NR); return !!(inl(lpcctl) & LBICTRL_LPCCTL_NR);
} }

12
drivers/mtd/nand/raw/plat_nand.c
View File

@ -23,13 +23,6 @@ struct plat_nand_data {
void __iomem *io_base; void __iomem *io_base;
}; };
static int plat_nand_dev_ready(struct mtd_info *mtd)
{
struct platform_nand_data *pdata = dev_get_platdata(mtd->dev.parent);
return pdata->ctrl.dev_ready(mtd_to_nand(mtd));
}
/* /*
* Probe for the NAND device. * Probe for the NAND device.
*/ */
@ -70,10 +63,7 @@ static int plat_nand_probe(struct platform_device *pdev)
data->chip.IO_ADDR_R = data->io_base; data->chip.IO_ADDR_R = data->io_base;
data->chip.IO_ADDR_W = data->io_base; data->chip.IO_ADDR_W = data->io_base;
data->chip.cmd_ctrl = pdata->ctrl.cmd_ctrl; data->chip.cmd_ctrl = pdata->ctrl.cmd_ctrl;
data->chip.dev_ready = pdata->ctrl.dev_ready;
if (pdata->ctrl.dev_ready)
data->chip.dev_ready = plat_nand_dev_ready;
data->chip.select_chip = pdata->ctrl.select_chip; data->chip.select_chip = pdata->ctrl.select_chip;
data->chip.write_buf = pdata->ctrl.write_buf; data->chip.write_buf = pdata->ctrl.write_buf;
data->chip.read_buf = pdata->ctrl.read_buf; data->chip.read_buf = pdata->ctrl.read_buf;

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

@ -373,7 +373,7 @@ static int r852_wait(struct mtd_info *mtd, struct nand_chip *chip)
msecs_to_jiffies(400) : msecs_to_jiffies(20)); msecs_to_jiffies(400) : msecs_to_jiffies(20));
while (time_before(jiffies, timeout)) while (time_before(jiffies, timeout))
if (chip->dev_ready(mtd)) if (chip->dev_ready(chip))
break; break;
nand_status_op(chip, &status); nand_status_op(chip, &status);
@ -390,9 +390,9 @@ static int r852_wait(struct mtd_info *mtd, struct nand_chip *chip)
* Check if card is ready * Check if card is ready
*/ */
static int r852_ready(struct mtd_info *mtd) static int r852_ready(struct nand_chip *chip)
{ {
struct r852_device *dev = r852_get_dev(mtd); struct r852_device *dev = r852_get_dev(nand_to_mtd(chip));
return !(r852_read_reg(dev, R852_CARD_STA) & R852_CARD_STA_BUSY); return !(r852_read_reg(dev, R852_CARD_STA) & R852_CARD_STA_BUSY);
} }

9
drivers/mtd/nand/raw/s3c2410.c
View File

@ -493,20 +493,23 @@ static void s3c2440_nand_hwcontrol(struct nand_chip *chip, int cmd,
* returns 0 if the nand is busy, 1 if it is ready * returns 0 if the nand is busy, 1 if it is ready
*/ */
static int s3c2410_nand_devready(struct mtd_info *mtd) static int s3c2410_nand_devready(struct nand_chip *chip)
{ {
struct mtd_info *mtd = nand_to_mtd(chip);
struct s3c2410_nand_info *info = s3c2410_nand_mtd_toinfo(mtd); struct s3c2410_nand_info *info = s3c2410_nand_mtd_toinfo(mtd);
return readb(info->regs + S3C2410_NFSTAT) & S3C2410_NFSTAT_BUSY; return readb(info->regs + S3C2410_NFSTAT) & S3C2410_NFSTAT_BUSY;
} }
static int s3c2440_nand_devready(struct mtd_info *mtd) static int s3c2440_nand_devready(struct nand_chip *chip)
{ {
struct mtd_info *mtd = nand_to_mtd(chip);
struct s3c2410_nand_info *info = s3c2410_nand_mtd_toinfo(mtd); struct s3c2410_nand_info *info = s3c2410_nand_mtd_toinfo(mtd);
return readb(info->regs + S3C2440_NFSTAT) & S3C2440_NFSTAT_READY; return readb(info->regs + S3C2440_NFSTAT) & S3C2440_NFSTAT_READY;
} }
static int s3c2412_nand_devready(struct mtd_info *mtd) static int s3c2412_nand_devready(struct nand_chip *chip)
{ {
struct mtd_info *mtd = nand_to_mtd(chip);
struct s3c2410_nand_info *info = s3c2410_nand_mtd_toinfo(mtd); struct s3c2410_nand_info *info = s3c2410_nand_mtd_toinfo(mtd);
return readb(info->regs + S3C2412_NFSTAT) & S3C2412_NFSTAT_READY; return readb(info->regs + S3C2412_NFSTAT) & S3C2412_NFSTAT_READY;
} }

4
drivers/mtd/nand/raw/sharpsl.c
View File

@ -78,9 +78,9 @@ static void sharpsl_nand_hwcontrol(struct nand_chip *chip, int cmd,
writeb(cmd, chip->IO_ADDR_W); writeb(cmd, chip->IO_ADDR_W);
} }
static int sharpsl_nand_dev_ready(struct mtd_info *mtd) static int sharpsl_nand_dev_ready(struct nand_chip *chip)
{ {
struct sharpsl_nand *sharpsl = mtd_to_sharpsl(mtd); struct sharpsl_nand *sharpsl = mtd_to_sharpsl(nand_to_mtd(chip));
return !((readb(sharpsl->io + FLASHCTL) & FLRYBY) == 0); return !((readb(sharpsl->io + FLASHCTL) & FLRYBY) == 0);
} }

3
drivers/mtd/nand/raw/socrates_nand.c
View File

@ -112,9 +112,8 @@ static void socrates_nand_cmd_ctrl(struct nand_chip *nand_chip, int cmd,
/* /*
* Read the Device Ready pin. * Read the Device Ready pin.
*/ */
static int socrates_nand_device_ready(struct mtd_info *mtd) static int socrates_nand_device_ready(struct nand_chip *nand_chip)
{ {
struct nand_chip *nand_chip = mtd_to_nand(mtd);
struct socrates_nand_host *host = nand_get_controller_data(nand_chip); struct socrates_nand_host *host = nand_get_controller_data(nand_chip);
if (in_be32(host->io_base) & FPGA_NAND_BUSY) if (in_be32(host->io_base) & FPGA_NAND_BUSY)

3
drivers/mtd/nand/raw/sunxi_nand.c
View File

@ -400,9 +400,8 @@ static void sunxi_nfc_dma_op_cleanup(struct mtd_info *mtd,
nfc->regs + NFC_REG_CTL); nfc->regs + NFC_REG_CTL);
} }
static int sunxi_nfc_dev_ready(struct mtd_info *mtd) static int sunxi_nfc_dev_ready(struct nand_chip *nand)
{ {
struct nand_chip *nand = mtd_to_nand(mtd);
struct sunxi_nand_chip *sunxi_nand = to_sunxi_nand(nand); struct sunxi_nand_chip *sunxi_nand = to_sunxi_nand(nand);
struct sunxi_nfc *nfc = to_sunxi_nfc(sunxi_nand->nand.controller); struct sunxi_nfc *nfc = to_sunxi_nfc(sunxi_nand->nand.controller);
u32 mask; u32 mask;

3
drivers/mtd/nand/raw/tango_nand.c
View File

@ -127,9 +127,8 @@ static void tango_cmd_ctrl(struct nand_chip *chip, int dat, unsigned int ctrl)
writeb_relaxed(dat, tchip->base + PBUS_ADDR); writeb_relaxed(dat, tchip->base + PBUS_ADDR);
} }
static int tango_dev_ready(struct mtd_info *mtd) static int tango_dev_ready(struct nand_chip *chip)
{ {
struct nand_chip *chip = mtd_to_nand(mtd);
struct tango_nfc *nfc = to_tango_nfc(chip->controller); struct tango_nfc *nfc = to_tango_nfc(chip->controller);
return readl_relaxed(nfc->pbus_base + PBUS_CS_CTRL) & PBUS_IORDY; return readl_relaxed(nfc->pbus_base + PBUS_CS_CTRL) & PBUS_IORDY;

8
drivers/mtd/nand/raw/tmio_nand.c
View File

@ -158,9 +158,9 @@ static void tmio_nand_hwcontrol(struct nand_chip *chip, int cmd,
tmio_iowrite8(cmd, chip->IO_ADDR_W); tmio_iowrite8(cmd, chip->IO_ADDR_W);
} }
static int tmio_nand_dev_ready(struct mtd_info *mtd) static int tmio_nand_dev_ready(struct nand_chip *chip)
{ {
struct tmio_nand *tmio = mtd_to_tmio(mtd); struct tmio_nand *tmio = mtd_to_tmio(nand_to_mtd(chip));
return !(tmio_ioread8(tmio->fcr + FCR_STATUS) & FCR_STATUS_BUSY); return !(tmio_ioread8(tmio->fcr + FCR_STATUS) & FCR_STATUS_BUSY);
} }
@ -198,10 +198,10 @@ tmio_nand_wait(struct mtd_info *mtd, struct nand_chip *nand_chip)
tmio_iowrite8(0x81, tmio->fcr + FCR_IMR); tmio_iowrite8(0x81, tmio->fcr + FCR_IMR);
timeout = wait_event_timeout(nand_chip->controller->wq, timeout = wait_event_timeout(nand_chip->controller->wq,
tmio_nand_dev_ready(mtd), tmio_nand_dev_ready(nand_chip),
msecs_to_jiffies(nand_chip->state == FL_ERASING ? 400 : 20)); msecs_to_jiffies(nand_chip->state == FL_ERASING ? 400 : 20));
if (unlikely(!tmio_nand_dev_ready(mtd))) { if (unlikely(!tmio_nand_dev_ready(nand_chip))) {
tmio_iowrite8(0x00, tmio->fcr + FCR_IMR); tmio_iowrite8(0x00, tmio->fcr + FCR_IMR);
dev_warn(&tmio->dev->dev, "still busy with %s after %d ms\n", dev_warn(&tmio->dev->dev, "still busy with %s after %d ms\n",
nand_chip->state == FL_ERASING ? "erase" : "program", nand_chip->state == FL_ERASING ? "erase" : "program",

4
drivers/mtd/nand/raw/txx9ndfmc.c
View File

@ -162,9 +162,9 @@ static void txx9ndfmc_cmd_ctrl(struct nand_chip *chip, int cmd,
mmiowb(); mmiowb();
} }
static int txx9ndfmc_dev_ready(struct mtd_info *mtd) static int txx9ndfmc_dev_ready(struct nand_chip *chip)
{ {
struct platform_device *dev = mtd_to_platdev(mtd); struct platform_device *dev = mtd_to_platdev(nand_to_mtd(chip));
return !(txx9ndfmc_read(dev, TXX9_NDFSR) & TXX9_NDFSR_BUSY); return !(txx9ndfmc_read(dev, TXX9_NDFSR) & TXX9_NDFSR_BUSY);
} }

2
drivers/mtd/nand/raw/xway_nand.c
View File

@ -121,7 +121,7 @@ static void xway_cmd_ctrl(struct nand_chip *chip, int cmd, unsigned int ctrl)
; ;
} }
static int xway_dev_ready(struct mtd_info *mtd) static int xway_dev_ready(struct nand_chip *chip)
{ {
return ltq_ebu_r32(EBU_NAND_WAIT) & NAND_WAIT_RD; return ltq_ebu_r32(EBU_NAND_WAIT) & NAND_WAIT_RD;
} }

2
include/linux/mtd/rawnand.h
View File

@ -1291,7 +1291,7 @@ struct nand_chip {
int (*block_bad)(struct nand_chip *chip, loff_t ofs); int (*block_bad)(struct nand_chip *chip, loff_t ofs);
int (*block_markbad)(struct nand_chip *chip, loff_t ofs); int (*block_markbad)(struct nand_chip *chip, loff_t ofs);
void (*cmd_ctrl)(struct nand_chip *chip, int dat, unsigned int ctrl); void (*cmd_ctrl)(struct nand_chip *chip, int dat, unsigned int ctrl);
int (*dev_ready)(struct mtd_info *mtd); int (*dev_ready)(struct nand_chip *chip);
void (*cmdfunc)(struct mtd_info *mtd, unsigned command, int column, void (*cmdfunc)(struct mtd_info *mtd, unsigned command, int column,
int page_addr); int page_addr);
int(*waitfunc)(struct mtd_info *mtd, struct nand_chip *this); int(*waitfunc)(struct mtd_info *mtd, struct nand_chip *this);