| Message ID | 20171025184257.ox7tlj4a3ulxoecf@lenoch (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Gentle ping... Btw, I have no clue where "[PATCH]" prefix vanished and I'm sorry for that. ladis On Wed, Oct 25, 2017 at 08:42:57PM +0200, Ladislav Michl wrote: > Deprecated gpmc_update_nand_reg() is no longer used, remove. > > Signed-off-by: Ladislav Michl <ladis@linux-mips.org> > --- > drivers/memory/omap-gpmc.c | 53 ++++++++++++++++++++------------------------- > include/linux/omap-gpmc.h | 12 ---------- > 2 files changed, 24 insertions(+), 41 deletions(-) > > diff --git a/drivers/memory/omap-gpmc.c b/drivers/memory/omap-gpmc.c > index f2aef0b87bc6..a385a35c7de9 100644 > --- a/drivers/memory/omap-gpmc.c > +++ b/drivers/memory/omap-gpmc.c > @@ -1075,10 +1075,33 @@ int gpmc_configure(int cmd, int wval) > } > EXPORT_SYMBOL(gpmc_configure); > > -void gpmc_update_nand_reg(struct gpmc_nand_regs *reg, int cs) > +static bool gpmc_nand_writebuffer_empty(void) > +{ > + if (gpmc_read_reg(GPMC_STATUS) & GPMC_STATUS_EMPTYWRITEBUFFERSTATUS) > + return true; > + > + return false; > +} > + > +static struct gpmc_nand_ops nand_ops = { > + .nand_writebuffer_empty = gpmc_nand_writebuffer_empty, > +}; > + > +/** > + * gpmc_omap_get_nand_ops - Get the GPMC NAND interface > + * @regs: the GPMC NAND register map exclusive for NAND use. > + * @cs: GPMC chip select number on which the NAND sits. The > + * register map returned will be specific to this chip select. > + * > + * Returns NULL on error e.g. invalid cs. > + */ > +struct gpmc_nand_ops *gpmc_omap_get_nand_ops(struct gpmc_nand_regs *reg, int cs) > { > int i; > > + if (cs >= gpmc_cs_num) > + return NULL; > + > reg->gpmc_nand_command = gpmc_base + GPMC_CS0_OFFSET + > GPMC_CS_NAND_COMMAND + GPMC_CS_SIZE * cs; > reg->gpmc_nand_address = gpmc_base + GPMC_CS0_OFFSET + > @@ -1110,34 +1133,6 @@ void gpmc_update_nand_reg(struct gpmc_nand_regs *reg, int cs) > reg->gpmc_bch_result6[i] = gpmc_base + GPMC_ECC_BCH_RESULT_6 + > i * GPMC_BCH_SIZE; > } > -} > - > -static bool gpmc_nand_writebuffer_empty(void) > -{ > - if (gpmc_read_reg(GPMC_STATUS) & GPMC_STATUS_EMPTYWRITEBUFFERSTATUS) > - return true; > - > - return false; > -} > - > -static struct gpmc_nand_ops nand_ops = { > - .nand_writebuffer_empty = gpmc_nand_writebuffer_empty, > -}; > - > -/** > - * gpmc_omap_get_nand_ops - Get the GPMC NAND interface > - * @regs: the GPMC NAND register map exclusive for NAND use. > - * @cs: GPMC chip select number on which the NAND sits. The > - * register map returned will be specific to this chip select. > - * > - * Returns NULL on error e.g. invalid cs. > - */ > -struct gpmc_nand_ops *gpmc_omap_get_nand_ops(struct gpmc_nand_regs *reg, int cs) > -{ > - if (cs >= gpmc_cs_num) > - return NULL; > - > - gpmc_update_nand_reg(reg, cs); > > return &nand_ops; > } > diff --git a/include/linux/omap-gpmc.h b/include/linux/omap-gpmc.h > index fd0de00c0d77..edfa280c3d56 100644 > --- a/include/linux/omap-gpmc.h > +++ b/include/linux/omap-gpmc.h > @@ -36,18 +36,6 @@ static inline struct gpmc_nand_ops *gpmc_omap_get_nand_ops(struct gpmc_nand_regs > } > #endif /* CONFIG_OMAP_GPMC */ > > -/*--------------------------------*/ > - > -/* deprecated APIs */ > -#if IS_ENABLED(CONFIG_OMAP_GPMC) > -void gpmc_update_nand_reg(struct gpmc_nand_regs *reg, int cs); > -#else > -static inline void gpmc_update_nand_reg(struct gpmc_nand_regs *reg, int cs) > -{ > -} > -#endif /* CONFIG_OMAP_GPMC */ > -/*--------------------------------*/ > - > extern int gpmc_calc_timings(struct gpmc_timings *gpmc_t, > struct gpmc_settings *gpmc_s, > struct gpmc_device_timings *dev_t); > -- > To unsubscribe from this list: send the line "unsubscribe linux-omap" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 03/11/17 08:34, Ladislav Michl wrote: > Gentle ping... > > Btw, I have no clue where "[PATCH]" prefix vanished and I'm sorry for that. > > ladis > > On Wed, Oct 25, 2017 at 08:42:57PM +0200, Ladislav Michl wrote: >> Deprecated gpmc_update_nand_reg() is no longer used, remove. >> >> Signed-off-by: Ladislav Michl <ladis@linux-mips.org> Patch looks fine to me. Since no functional change let's see if we can get it in for v4.15. Thanks. >> --- >> drivers/memory/omap-gpmc.c | 53 ++++++++++++++++++++------------------------- >> include/linux/omap-gpmc.h | 12 ---------- >> 2 files changed, 24 insertions(+), 41 deletions(-) >> >> diff --git a/drivers/memory/omap-gpmc.c b/drivers/memory/omap-gpmc.c >> index f2aef0b87bc6..a385a35c7de9 100644 >> --- a/drivers/memory/omap-gpmc.c >> +++ b/drivers/memory/omap-gpmc.c >> @@ -1075,10 +1075,33 @@ int gpmc_configure(int cmd, int wval) >> } >> EXPORT_SYMBOL(gpmc_configure); >> >> -void gpmc_update_nand_reg(struct gpmc_nand_regs *reg, int cs) >> +static bool gpmc_nand_writebuffer_empty(void) >> +{ >> + if (gpmc_read_reg(GPMC_STATUS) & GPMC_STATUS_EMPTYWRITEBUFFERSTATUS) >> + return true; >> + >> + return false; >> +} >> + >> +static struct gpmc_nand_ops nand_ops = { >> + .nand_writebuffer_empty = gpmc_nand_writebuffer_empty, >> +}; >> + >> +/** >> + * gpmc_omap_get_nand_ops - Get the GPMC NAND interface >> + * @regs: the GPMC NAND register map exclusive for NAND use. >> + * @cs: GPMC chip select number on which the NAND sits. The >> + * register map returned will be specific to this chip select. >> + * >> + * Returns NULL on error e.g. invalid cs. >> + */ >> +struct gpmc_nand_ops *gpmc_omap_get_nand_ops(struct gpmc_nand_regs *reg, int cs) >> { >> int i; >> >> + if (cs >= gpmc_cs_num) >> + return NULL; >> + >> reg->gpmc_nand_command = gpmc_base + GPMC_CS0_OFFSET + >> GPMC_CS_NAND_COMMAND + GPMC_CS_SIZE * cs; >> reg->gpmc_nand_address = gpmc_base + GPMC_CS0_OFFSET + >> @@ -1110,34 +1133,6 @@ void gpmc_update_nand_reg(struct gpmc_nand_regs *reg, int cs) >> reg->gpmc_bch_result6[i] = gpmc_base + GPMC_ECC_BCH_RESULT_6 + >> i * GPMC_BCH_SIZE; >> } >> -} >> - >> -static bool gpmc_nand_writebuffer_empty(void) >> -{ >> - if (gpmc_read_reg(GPMC_STATUS) & GPMC_STATUS_EMPTYWRITEBUFFERSTATUS) >> - return true; >> - >> - return false; >> -} >> - >> -static struct gpmc_nand_ops nand_ops = { >> - .nand_writebuffer_empty = gpmc_nand_writebuffer_empty, >> -}; >> - >> -/** >> - * gpmc_omap_get_nand_ops - Get the GPMC NAND interface >> - * @regs: the GPMC NAND register map exclusive for NAND use. >> - * @cs: GPMC chip select number on which the NAND sits. The >> - * register map returned will be specific to this chip select. >> - * >> - * Returns NULL on error e.g. invalid cs. >> - */ >> -struct gpmc_nand_ops *gpmc_omap_get_nand_ops(struct gpmc_nand_regs *reg, int cs) >> -{ >> - if (cs >= gpmc_cs_num) >> - return NULL; >> - >> - gpmc_update_nand_reg(reg, cs); >> >> return &nand_ops; >> } >> diff --git a/include/linux/omap-gpmc.h b/include/linux/omap-gpmc.h >> index fd0de00c0d77..edfa280c3d56 100644 >> --- a/include/linux/omap-gpmc.h >> +++ b/include/linux/omap-gpmc.h >> @@ -36,18 +36,6 @@ static inline struct gpmc_nand_ops *gpmc_omap_get_nand_ops(struct gpmc_nand_regs >> } >> #endif /* CONFIG_OMAP_GPMC */ >> >> -/*--------------------------------*/ >> - >> -/* deprecated APIs */ >> -#if IS_ENABLED(CONFIG_OMAP_GPMC) >> -void gpmc_update_nand_reg(struct gpmc_nand_regs *reg, int cs); >> -#else >> -static inline void gpmc_update_nand_reg(struct gpmc_nand_regs *reg, int cs) >> -{ >> -} >> -#endif /* CONFIG_OMAP_GPMC */ >> -/*--------------------------------*/ >> - >> extern int gpmc_calc_timings(struct gpmc_timings *gpmc_t, >> struct gpmc_settings *gpmc_s, >> struct gpmc_device_timings *dev_t);
diff --git a/drivers/memory/omap-gpmc.c b/drivers/memory/omap-gpmc.c index f2aef0b87bc6..a385a35c7de9 100644 --- a/drivers/memory/omap-gpmc.c +++ b/drivers/memory/omap-gpmc.c @@ -1075,10 +1075,33 @@ int gpmc_configure(int cmd, int wval) } EXPORT_SYMBOL(gpmc_configure); -void gpmc_update_nand_reg(struct gpmc_nand_regs *reg, int cs) +static bool gpmc_nand_writebuffer_empty(void) +{ + if (gpmc_read_reg(GPMC_STATUS) & GPMC_STATUS_EMPTYWRITEBUFFERSTATUS) + return true; + + return false; +} + +static struct gpmc_nand_ops nand_ops = { + .nand_writebuffer_empty = gpmc_nand_writebuffer_empty, +}; + +/** + * gpmc_omap_get_nand_ops - Get the GPMC NAND interface + * @regs: the GPMC NAND register map exclusive for NAND use. + * @cs: GPMC chip select number on which the NAND sits. The + * register map returned will be specific to this chip select. + * + * Returns NULL on error e.g. invalid cs. + */ +struct gpmc_nand_ops *gpmc_omap_get_nand_ops(struct gpmc_nand_regs *reg, int cs) { int i; + if (cs >= gpmc_cs_num) + return NULL; + reg->gpmc_nand_command = gpmc_base + GPMC_CS0_OFFSET + GPMC_CS_NAND_COMMAND + GPMC_CS_SIZE * cs; reg->gpmc_nand_address = gpmc_base + GPMC_CS0_OFFSET + @@ -1110,34 +1133,6 @@ void gpmc_update_nand_reg(struct gpmc_nand_regs *reg, int cs) reg->gpmc_bch_result6[i] = gpmc_base + GPMC_ECC_BCH_RESULT_6 + i * GPMC_BCH_SIZE; } -} - -static bool gpmc_nand_writebuffer_empty(void) -{ - if (gpmc_read_reg(GPMC_STATUS) & GPMC_STATUS_EMPTYWRITEBUFFERSTATUS) - return true; - - return false; -} - -static struct gpmc_nand_ops nand_ops = { - .nand_writebuffer_empty = gpmc_nand_writebuffer_empty, -}; - -/** - * gpmc_omap_get_nand_ops - Get the GPMC NAND interface - * @regs: the GPMC NAND register map exclusive for NAND use. - * @cs: GPMC chip select number on which the NAND sits. The - * register map returned will be specific to this chip select. - * - * Returns NULL on error e.g. invalid cs. - */ -struct gpmc_nand_ops *gpmc_omap_get_nand_ops(struct gpmc_nand_regs *reg, int cs) -{ - if (cs >= gpmc_cs_num) - return NULL; - - gpmc_update_nand_reg(reg, cs); return &nand_ops; } diff --git a/include/linux/omap-gpmc.h b/include/linux/omap-gpmc.h index fd0de00c0d77..edfa280c3d56 100644 --- a/include/linux/omap-gpmc.h +++ b/include/linux/omap-gpmc.h @@ -36,18 +36,6 @@ static inline struct gpmc_nand_ops *gpmc_omap_get_nand_ops(struct gpmc_nand_regs } #endif /* CONFIG_OMAP_GPMC */ -/*--------------------------------*/ - -/* deprecated APIs */ -#if IS_ENABLED(CONFIG_OMAP_GPMC) -void gpmc_update_nand_reg(struct gpmc_nand_regs *reg, int cs); -#else -static inline void gpmc_update_nand_reg(struct gpmc_nand_regs *reg, int cs) -{ -} -#endif /* CONFIG_OMAP_GPMC */ -/*--------------------------------*/ - extern int gpmc_calc_timings(struct gpmc_timings *gpmc_t, struct gpmc_settings *gpmc_s, struct gpmc_device_timings *dev_t);
Deprecated gpmc_update_nand_reg() is no longer used, remove. Signed-off-by: Ladislav Michl <ladis@linux-mips.org> --- drivers/memory/omap-gpmc.c | 53 ++++++++++++++++++++------------------------- include/linux/omap-gpmc.h | 12 ---------- 2 files changed, 24 insertions(+), 41 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html