Skip to content

Commit

Permalink
mtd: rawnand: denali: use bool type instead of int where appropriate
Browse files Browse the repository at this point in the history 
Use 'bool' type for the following boolean parameters.

 - write (write or read?)
 - dma_avail (DMA engine available or not?)

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
  • Loading branch information
Masahiro Yamada authored and Miquel Raynal committed Apr 18, 2019
1 parent f554114 commit f4f16fd
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 13 deletions.
23 changes: 12 additions & 11 deletions drivers/mtd/nand/raw/denali.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -533,7 +533,7 @@ static int denali_sw_ecc_fixup(struct nand_chip *chip,
}

static void denali_setup_dma64(struct denali_nand_info *denali,
dma_addr_t dma_addr, int page, int write)
dma_addr_t dma_addr, int page, bool write)
{
uint32_t mode;
const int page_count = 1;
Expand All @@ -547,7 +547,8 @@ static void denali_setup_dma64(struct denali_nand_info *denali,
* burst len = 64 bytes, the number of pages
*/
denali->host_write(denali, mode,
0x01002000 | (64 << 16) | (write << 8) | page_count);
0x01002000 | (64 << 16) |
(write ? BIT(8) : 0) | page_count);

/* 2. set memory low address */
denali->host_write(denali, mode, lower_32_bits(dma_addr));
Expand All @@ -557,7 +558,7 @@ static void denali_setup_dma64(struct denali_nand_info *denali,
}

static void denali_setup_dma32(struct denali_nand_info *denali,
dma_addr_t dma_addr, int page, int write)
dma_addr_t dma_addr, int page, bool write)
{
uint32_t mode;
const int page_count = 1;
Expand All @@ -568,7 +569,7 @@ static void denali_setup_dma32(struct denali_nand_info *denali,

/* 1. setup transfer type and # of pages */
denali->host_write(denali, mode | page,
0x2000 | (write << 8) | page_count);
0x2000 | (write ? BIT(8) : 0) | page_count);

/* 2. set memory high address bits 23:8 */
denali->host_write(denali, mode | ((dma_addr >> 16) << 8), 0x2200);
Expand Down Expand Up @@ -628,7 +629,7 @@ static int denali_pio_write(struct denali_nand_info *denali, const u32 *buf,
}

static int denali_pio_xfer(struct denali_nand_info *denali, void *buf,
size_t size, int page, int write)
size_t size, int page, bool write)
{
if (write)
return denali_pio_write(denali, buf, size, page);
Expand All @@ -637,7 +638,7 @@ static int denali_pio_xfer(struct denali_nand_info *denali, void *buf,
}

static int denali_dma_xfer(struct denali_nand_info *denali, void *buf,
size_t size, int page, int write)
size_t size, int page, bool write)
{
dma_addr_t dma_addr;
uint32_t irq_mask, irq_status, ecc_err_mask;
Expand Down Expand Up @@ -694,7 +695,7 @@ static int denali_dma_xfer(struct denali_nand_info *denali, void *buf,
}

static int denali_page_xfer(struct nand_chip *chip, void *buf, size_t size,
int page, int write)
int page, bool write)
{
struct denali_nand_info *denali = to_denali(chip);

Expand All @@ -715,7 +716,7 @@ static int denali_read_page(struct nand_chip *chip, uint8_t *buf,
int stat = 0;
int ret;

ret = denali_page_xfer(chip, buf, mtd->writesize, page, 0);
ret = denali_page_xfer(chip, buf, mtd->writesize, page, false);
if (ret && ret != -EBADMSG)
return ret;

Expand Down Expand Up @@ -744,7 +745,7 @@ static int denali_write_page(struct nand_chip *chip, const uint8_t *buf,
{
struct mtd_info *mtd = nand_to_mtd(chip);

return denali_page_xfer(chip, (void *)buf, mtd->writesize, page, 1);
return denali_page_xfer(chip, (void *)buf, mtd->writesize, page, true);
}

static int denali_setup_data_interface(struct nand_chip *chip, int chipnr,
Expand Down Expand Up @@ -1005,7 +1006,7 @@ static int denali_attach_chip(struct nand_chip *chip)
int ret;

if (ioread32(denali->reg + FEATURES) & FEATURES__DMA)
denali->dma_avail = 1;
denali->dma_avail = true;

if (denali->dma_avail) {
int dma_bit = denali->caps & DENALI_CAP_DMA_64BIT ? 64 : 32;
Expand All @@ -1014,7 +1015,7 @@ static int denali_attach_chip(struct nand_chip *chip)
if (ret) {
dev_info(denali->dev,
"Failed to set DMA mask. Disabling DMA.\n");
denali->dma_avail = 0;
denali->dma_avail = false;
}
}

Expand Down
4 changes: 2 additions & 2 deletions drivers/mtd/nand/raw/denali.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,7 @@ struct denali_nand_info {
u32 irq_mask; /* interrupts we are waiting for */
u32 irq_status; /* interrupts that have happened */
int irq;
int dma_avail; /* can support DMA? */
bool dma_avail; /* can support DMA? */
int devs_per_cs; /* devices connected in parallel */
int oob_skip_bytes; /* number of bytes reserved for BBM */
int max_banks;
Expand All @@ -313,7 +313,7 @@ struct denali_nand_info {
u32 (*host_read)(struct denali_nand_info *denali, u32 addr);
void (*host_write)(struct denali_nand_info *denali, u32 addr, u32 data);
void (*setup_dma)(struct denali_nand_info *denali, dma_addr_t dma_addr,
int page, int write);
int page, bool write);
};

#define DENALI_CAP_HW_ECC_FIXUP BIT(0)
Expand Down

0 comments on commit f4f16fd

Please sign in to comment.