microsoft
/
WSL2-Linux-Kernel
зеркало из https://github.com/microsoft/WSL2-Linux-Kernel.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

mtd: nand: omap2: create and use mtd_to_omap() 

Define and use mtd_to_omap() instead of container_of();

Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Signed-off-by: Brian Norris <computersforpeace@gmail.com>
This commit is contained in:
Boris BREZILLON 2015-12-10 08:59:48 +01:00 коммит произвёл Brian Norris
Родитель faee6c358b
Коммит 4578ea9a99
1 изменённых файлов: 21 добавлений и 34 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

55
drivers/mtd/nand/omap2.c
Просмотреть файл

@ -177,6 +177,10 @@ struct omap_nand_info {
struct device_node *of_node; struct device_node *of_node;
}; };
static inline struct omap_nand_info *mtd_to_omap(struct mtd_info *mtd)
{
return container_of(mtd, struct omap_nand_info, mtd);
}
/** /**
* omap_prefetch_enable - configures and starts prefetch transfer * omap_prefetch_enable - configures and starts prefetch transfer
* @cs: cs (chip select) number * @cs: cs (chip select) number
@ -247,8 +251,7 @@ static int omap_prefetch_reset(int cs, struct omap_nand_info *info)
*/ */
static void omap_hwcontrol(struct mtd_info *mtd, int cmd, unsigned int ctrl) static void omap_hwcontrol(struct mtd_info *mtd, int cmd, unsigned int ctrl)
{ {
struct omap_nand_info *info = container_of(mtd, struct omap_nand_info *info = mtd_to_omap(mtd);
struct omap_nand_info, mtd);
if (cmd != NAND_CMD_NONE) { if (cmd != NAND_CMD_NONE) {
if (ctrl & NAND_CLE) if (ctrl & NAND_CLE)
@ -283,8 +286,7 @@ static void omap_read_buf8(struct mtd_info *mtd, u_char *buf, int len)
*/ */
static void omap_write_buf8(struct mtd_info *mtd, const u_char *buf, int len) static void omap_write_buf8(struct mtd_info *mtd, const u_char *buf, int len)
{ {
struct omap_nand_info *info = container_of(mtd, struct omap_nand_info *info = mtd_to_omap(mtd);
struct omap_nand_info, mtd);
u_char *p = (u_char *)buf; u_char *p = (u_char *)buf;
u32 status = 0; u32 status = 0;
@ -319,8 +321,7 @@ static void omap_read_buf16(struct mtd_info *mtd, u_char *buf, int len)
*/ */
static void omap_write_buf16(struct mtd_info *mtd, const u_char * buf, int len) static void omap_write_buf16(struct mtd_info *mtd, const u_char * buf, int len)
{ {
struct omap_nand_info *info = container_of(mtd, struct omap_nand_info *info = mtd_to_omap(mtd);
struct omap_nand_info, mtd);
u16 *p = (u16 *) buf; u16 *p = (u16 *) buf;
u32 status = 0; u32 status = 0;
/* FIXME try bursts of writesw() or DMA ... */ /* FIXME try bursts of writesw() or DMA ... */
@ -344,8 +345,7 @@ static void omap_write_buf16(struct mtd_info *mtd, const u_char * buf, int len)
*/ */
static void omap_read_buf_pref(struct mtd_info *mtd, u_char *buf, int len) static void omap_read_buf_pref(struct mtd_info *mtd, u_char *buf, int len)
{ {
struct omap_nand_info *info = container_of(mtd, struct omap_nand_info *info = mtd_to_omap(mtd);
struct omap_nand_info, mtd);
uint32_t r_count = 0; uint32_t r_count = 0;
int ret = 0; int ret = 0;
u32 *p = (u32 *)buf; u32 *p = (u32 *)buf;
@ -392,8 +392,7 @@ static void omap_read_buf_pref(struct mtd_info *mtd, u_char *buf, int len)
static void omap_write_buf_pref(struct mtd_info *mtd, static void omap_write_buf_pref(struct mtd_info *mtd,
const u_char *buf, int len) const u_char *buf, int len)
{ {
struct omap_nand_info *info = container_of(mtd, struct omap_nand_info *info = mtd_to_omap(mtd);
struct omap_nand_info, mtd);
uint32_t w_count = 0; uint32_t w_count = 0;
int i = 0, ret = 0; int i = 0, ret = 0;
u16 *p = (u16 *)buf; u16 *p = (u16 *)buf;
@ -458,8 +457,7 @@ static void omap_nand_dma_callback(void *data)
static inline int omap_nand_dma_transfer(struct mtd_info *mtd, void *addr, static inline int omap_nand_dma_transfer(struct mtd_info *mtd, void *addr,
unsigned int len, int is_write) unsigned int len, int is_write)
{ {
struct omap_nand_info *info = container_of(mtd, struct omap_nand_info *info = mtd_to_omap(mtd);
struct omap_nand_info, mtd);
struct dma_async_tx_descriptor *tx; struct dma_async_tx_descriptor *tx;
enum dma_data_direction dir = is_write ? DMA_TO_DEVICE : enum dma_data_direction dir = is_write ? DMA_TO_DEVICE :
DMA_FROM_DEVICE; DMA_FROM_DEVICE;
@ -623,8 +621,7 @@ done:
*/ */
static void omap_read_buf_irq_pref(struct mtd_info *mtd, u_char *buf, int len) static void omap_read_buf_irq_pref(struct mtd_info *mtd, u_char *buf, int len)
{ {
struct omap_nand_info *info = container_of(mtd, struct omap_nand_info *info = mtd_to_omap(mtd);
struct omap_nand_info, mtd);
int ret = 0; int ret = 0;
if (len <= mtd->oobsize) { if (len <= mtd->oobsize) {
@ -671,8 +668,7 @@ out_copy:
static void omap_write_buf_irq_pref(struct mtd_info *mtd, static void omap_write_buf_irq_pref(struct mtd_info *mtd,
const u_char *buf, int len) const u_char *buf, int len)
{ {
struct omap_nand_info *info = container_of(mtd, struct omap_nand_info *info = mtd_to_omap(mtd);
struct omap_nand_info, mtd);
int ret = 0; int ret = 0;
unsigned long tim, limit; unsigned long tim, limit;
u32 val; u32 val;
@ -886,8 +882,7 @@ static int omap_compare_ecc(u8 *ecc_data1, /* read from NAND memory */
static int omap_correct_data(struct mtd_info *mtd, u_char *dat, static int omap_correct_data(struct mtd_info *mtd, u_char *dat,
u_char *read_ecc, u_char *calc_ecc) u_char *read_ecc, u_char *calc_ecc)
{ {
struct omap_nand_info *info = container_of(mtd, struct omap_nand_info, struct omap_nand_info *info = mtd_to_omap(mtd);
mtd);
int blockCnt = 0, i = 0, ret = 0; int blockCnt = 0, i = 0, ret = 0;
int stat = 0; int stat = 0;
@ -928,8 +923,7 @@ static int omap_correct_data(struct mtd_info *mtd, u_char *dat,
static int omap_calculate_ecc(struct mtd_info *mtd, const u_char *dat, static int omap_calculate_ecc(struct mtd_info *mtd, const u_char *dat,
u_char *ecc_code) u_char *ecc_code)
{ {
struct omap_nand_info *info = container_of(mtd, struct omap_nand_info, struct omap_nand_info *info = mtd_to_omap(mtd);
mtd);
u32 val; u32 val;
val = readl(info->reg.gpmc_ecc_config); val = readl(info->reg.gpmc_ecc_config);
@ -953,8 +947,7 @@ static int omap_calculate_ecc(struct mtd_info *mtd, const u_char *dat,
*/ */
static void omap_enable_hwecc(struct mtd_info *mtd, int mode) static void omap_enable_hwecc(struct mtd_info *mtd, int mode)
{ {
struct omap_nand_info *info = container_of(mtd, struct omap_nand_info, struct omap_nand_info *info = mtd_to_omap(mtd);
mtd);
struct nand_chip *chip = mtd_to_nand(mtd); struct nand_chip *chip = mtd_to_nand(mtd);
unsigned int dev_width = (chip->options & NAND_BUSWIDTH_16) ? 1 : 0; unsigned int dev_width = (chip->options & NAND_BUSWIDTH_16) ? 1 : 0;
u32 val; u32 val;
@ -1002,8 +995,7 @@ static void omap_enable_hwecc(struct mtd_info *mtd, int mode)
static int omap_wait(struct mtd_info *mtd, struct nand_chip *chip) static int omap_wait(struct mtd_info *mtd, struct nand_chip *chip)
{ {
struct nand_chip *this = mtd_to_nand(mtd); struct nand_chip *this = mtd_to_nand(mtd);
struct omap_nand_info *info = container_of(mtd, struct omap_nand_info, struct omap_nand_info *info = mtd_to_omap(mtd);
mtd);
unsigned long timeo = jiffies; unsigned long timeo = jiffies;
int status, state = this->state; int status, state = this->state;
@ -1031,8 +1023,7 @@ static int omap_wait(struct mtd_info *mtd, struct nand_chip *chip)
static int omap_dev_ready(struct mtd_info *mtd) static int omap_dev_ready(struct mtd_info *mtd)
{ {
unsigned int val = 0; unsigned int val = 0;
struct omap_nand_info *info = container_of(mtd, struct omap_nand_info, struct omap_nand_info *info = mtd_to_omap(mtd);
mtd);
val = readl(info->reg.gpmc_status); val = readl(info->reg.gpmc_status);
@ -1058,8 +1049,7 @@ static void __maybe_unused omap_enable_hwecc_bch(struct mtd_info *mtd, int mode)
{ {
unsigned int bch_type; unsigned int bch_type;
unsigned int dev_width, nsectors; unsigned int dev_width, nsectors;
struct omap_nand_info *info = container_of(mtd, struct omap_nand_info, struct omap_nand_info *info = mtd_to_omap(mtd);
mtd);
enum omap_ecc ecc_opt = info->ecc_opt; enum omap_ecc ecc_opt = info->ecc_opt;
struct nand_chip *chip = mtd_to_nand(mtd); struct nand_chip *chip = mtd_to_nand(mtd);
u32 val, wr_mode; u32 val, wr_mode;
@ -1162,8 +1152,7 @@ static u8 bch8_polynomial[] = {0xef, 0x51, 0x2e, 0x09, 0xed, 0x93, 0x9a, 0xc2,
static int __maybe_unused omap_calculate_ecc_bch(struct mtd_info *mtd, static int __maybe_unused omap_calculate_ecc_bch(struct mtd_info *mtd,
const u_char *dat, u_char *ecc_calc) const u_char *dat, u_char *ecc_calc)
{ {
struct omap_nand_info *info = container_of(mtd, struct omap_nand_info, struct omap_nand_info *info = mtd_to_omap(mtd);
mtd);
int eccbytes = info->nand.ecc.bytes; int eccbytes = info->nand.ecc.bytes;
struct gpmc_nand_regs *gpmc_regs = &info->reg; struct gpmc_nand_regs *gpmc_regs = &info->reg;
u8 *ecc_code; u8 *ecc_code;
@ -1334,8 +1323,7 @@ static int erased_sector_bitflips(u_char *data, u_char *oob,
static int omap_elm_correct_data(struct mtd_info *mtd, u_char *data, static int omap_elm_correct_data(struct mtd_info *mtd, u_char *data,
u_char *read_ecc, u_char *calc_ecc) u_char *read_ecc, u_char *calc_ecc)
{ {
struct omap_nand_info *info = container_of(mtd, struct omap_nand_info, struct omap_nand_info *info = mtd_to_omap(mtd);
mtd);
struct nand_ecc_ctrl *ecc = &info->nand.ecc; struct nand_ecc_ctrl *ecc = &info->nand.ecc;
int eccsteps = info->nand.ecc.steps; int eccsteps = info->nand.ecc.steps;
int i , j, stat = 0; int i , j, stat = 0;
@ -2057,8 +2045,7 @@ static int omap_nand_remove(struct platform_device *pdev)
{ {
struct mtd_info *mtd = platform_get_drvdata(pdev); struct mtd_info *mtd = platform_get_drvdata(pdev);
struct nand_chip *nand_chip = mtd_to_nand(mtd); struct nand_chip *nand_chip = mtd_to_nand(mtd);
struct omap_nand_info *info = container_of(mtd, struct omap_nand_info, struct omap_nand_info *info = mtd_to_omap(mtd);
mtd);
if (nand_chip->ecc.priv) { if (nand_chip->ecc.priv) {
nand_bch_free(nand_chip->ecc.priv); nand_bch_free(nand_chip->ecc.priv);
nand_chip->ecc.priv = NULL; nand_chip->ecc.priv = NULL;