lkml.org 
[lkml]   [2019]   [Feb]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v2 10/10] mtd: rawnand: denali: clean up coding style
    Date
    Eliminate the following reports from 'scripts/checkpatch.pl --strict'.

    CHECK: Prefer kernel type 'u8' over 'uint8_t'
    CHECK: Prefer kernel type 'u32' over 'uint32_t'
    CHECK: Alignment should match open parenthesis

    I slightly changed denali_check_erased_page() to make it shorter.

    Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
    ---

    Changes in v2: None

    drivers/mtd/nand/raw/denali.c | 53 ++++++++++++++++++++-----------------------
    1 file changed, 25 insertions(+), 28 deletions(-)

    diff --git a/drivers/mtd/nand/raw/denali.c b/drivers/mtd/nand/raw/denali.c
    index eb58136..82b2b8e 100644
    --- a/drivers/mtd/nand/raw/denali.c
    +++ b/drivers/mtd/nand/raw/denali.c
    @@ -124,7 +124,7 @@ static irqreturn_t denali_isr(int irq, void *dev_id)
    {
    struct denali_controller *denali = dev_id;
    irqreturn_t ret = IRQ_NONE;
    - uint32_t irq_status;
    + u32 irq_status;
    int i;

    spin_lock(&denali->irq_lock);
    @@ -164,7 +164,7 @@ static u32 denali_wait_for_irq(struct denali_controller *denali, u32 irq_mask,
    unsigned int timeout_ms)
    {
    unsigned long time_left, flags;
    - uint32_t irq_status;
    + u32 irq_status;

    spin_lock_irqsave(&denali->irq_lock, flags);

    @@ -239,20 +239,17 @@ static int denali_check_erased_page(struct nand_chip *chip,
    unsigned int max_bitflips)
    {
    struct mtd_ecc_stats *ecc_stats = &nand_to_mtd(chip)->ecc_stats;
    - uint8_t *ecc_code = chip->oob_poi + denali->oob_skip_bytes;
    - int ecc_steps = chip->ecc.steps;
    - int ecc_size = chip->ecc.size;
    - int ecc_bytes = chip->ecc.bytes;
    + struct nand_ecc_ctrl *ecc = &chip->ecc;
    + u8 *ecc_code = chip->oob_poi + denali->oob_skip_bytes;
    int i, stat;

    - for (i = 0; i < ecc_steps; i++) {
    + for (i = 0; i < ecc->steps; i++) {
    if (!(uncor_ecc_flags & BIT(i)))
    continue;

    - stat = nand_check_erased_ecc_chunk(buf, ecc_size,
    - ecc_code, ecc_bytes,
    - NULL, 0,
    - chip->ecc.strength);
    + stat = nand_check_erased_ecc_chunk(buf, ecc->size, ecc_code,
    + ecc->bytes, NULL, 0,
    + ecc->strength);
    if (stat < 0) {
    ecc_stats->failed++;
    } else {
    @@ -260,8 +257,8 @@ static int denali_check_erased_page(struct nand_chip *chip,
    max_bitflips = max_t(unsigned int, max_bitflips, stat);
    }

    - buf += ecc_size;
    - ecc_code += ecc_bytes;
    + buf += ecc->size;
    + ecc_code += ecc->bytes;
    }

    return max_bitflips;
    @@ -273,7 +270,7 @@ static int denali_hw_ecc_fixup(struct nand_chip *chip,
    {
    struct mtd_ecc_stats *ecc_stats = &nand_to_mtd(chip)->ecc_stats;
    int bank = denali->active_bank;
    - uint32_t ecc_cor;
    + u32 ecc_cor;
    unsigned int max_bitflips;

    ecc_cor = ioread32(denali->reg + ECC_COR_INFO(bank));
    @@ -304,17 +301,17 @@ static int denali_hw_ecc_fixup(struct nand_chip *chip,

    static int denali_sw_ecc_fixup(struct nand_chip *chip,
    struct denali_controller *denali,
    - unsigned long *uncor_ecc_flags, uint8_t *buf)
    + unsigned long *uncor_ecc_flags, u8 *buf)
    {
    struct mtd_ecc_stats *ecc_stats = &nand_to_mtd(chip)->ecc_stats;
    unsigned int ecc_size = chip->ecc.size;
    unsigned int bitflips = 0;
    unsigned int max_bitflips = 0;
    - uint32_t err_addr, err_cor_info;
    + u32 err_addr, err_cor_info;
    unsigned int err_byte, err_sector, err_device;
    - uint8_t err_cor_value;
    + u8 err_cor_value;
    unsigned int prev_sector = 0;
    - uint32_t irq_status;
    + u32 irq_status;

    denali_reset_irq(denali);

    @@ -379,7 +376,7 @@ static int denali_sw_ecc_fixup(struct nand_chip *chip,
    static void denali_setup_dma64(struct denali_controller *denali,
    dma_addr_t dma_addr, int page, bool write)
    {
    - uint32_t mode;
    + u32 mode;
    const int page_count = 1;

    mode = DENALI_MAP10 | DENALI_BANK(denali) | page;
    @@ -404,7 +401,7 @@ static void denali_setup_dma64(struct denali_controller *denali,
    static void denali_setup_dma32(struct denali_controller *denali,
    dma_addr_t dma_addr, int page, bool write)
    {
    - uint32_t mode;
    + u32 mode;
    const int page_count = 1;

    mode = DENALI_MAP10 | DENALI_BANK(denali);
    @@ -429,7 +426,7 @@ static int denali_pio_read(struct denali_controller *denali, u32 *buf,
    size_t size, int page)
    {
    u32 addr = DENALI_MAP01 | DENALI_BANK(denali) | page;
    - uint32_t irq_status, ecc_err_mask;
    + u32 irq_status, ecc_err_mask;
    int i;

    if (denali->caps & DENALI_CAP_HW_ECC_FIXUP)
    @@ -456,7 +453,7 @@ static int denali_pio_write(struct denali_controller *denali, const u32 *buf,
    size_t size, int page)
    {
    u32 addr = DENALI_MAP01 | DENALI_BANK(denali) | page;
    - uint32_t irq_status;
    + u32 irq_status;
    int i;

    denali_reset_irq(denali);
    @@ -487,7 +484,7 @@ static int denali_dma_xfer(struct denali_controller *denali, void *buf,
    size_t size, int page, bool write)
    {
    dma_addr_t dma_addr;
    - uint32_t irq_mask, irq_status, ecc_err_mask;
    + u32 irq_mask, irq_status, ecc_err_mask;
    enum dma_data_direction dir = write ? DMA_TO_DEVICE : DMA_FROM_DEVICE;
    int ret = 0;

    @@ -654,7 +651,7 @@ static int denali_memcpy_in(void *buf, unsigned int offset, unsigned int len,
    return 0;
    }

    -static int denali_read_page_raw(struct nand_chip *chip, uint8_t *buf,
    +static int denali_read_page_raw(struct nand_chip *chip, u8 *buf,
    int oob_required, int page)
    {
    struct denali_chip *dchip = to_denali_chip(chip);
    @@ -691,7 +688,7 @@ static int denali_memcpy_out(void *buf, unsigned int offset, unsigned int len,
    return 0;
    }

    -static int denali_write_page_raw(struct nand_chip *chip, const uint8_t *buf,
    +static int denali_write_page_raw(struct nand_chip *chip, const u8 *buf,
    int oob_required, int page)
    {
    struct denali_chip *dchip = to_denali_chip(chip);
    @@ -765,7 +762,7 @@ static int denali_write_oob(struct nand_chip *chip, int page)
    return nand_prog_page_end_op(chip);
    }

    -static int denali_read_page(struct nand_chip *chip, uint8_t *buf,
    +static int denali_read_page(struct nand_chip *chip, u8 *buf,
    int oob_required, int page)
    {
    struct denali_controller *denali = to_denali_controller(chip);
    @@ -798,7 +795,7 @@ static int denali_read_page(struct nand_chip *chip, uint8_t *buf,
    return stat;
    }

    -static int denali_write_page(struct nand_chip *chip, const uint8_t *buf,
    +static int denali_write_page(struct nand_chip *chip, const u8 *buf,
    int oob_required, int page)
    {
    struct mtd_info *mtd = nand_to_mtd(chip);
    @@ -817,7 +814,7 @@ static int denali_setup_data_interface(struct nand_chip *chip, int chipnr,
    int acc_clks, re_2_we, re_2_re, we_2_re, addr_2_data;
    int rdwr_en_lo, rdwr_en_hi, rdwr_en_lo_hi, cs_setup;
    int addr_2_data_mask;
    - uint32_t tmp;
    + u32 tmp;

    timings = nand_get_sdr_timings(conf);
    if (IS_ERR(timings))
    --
    2.7.4
    \
     
     \ /
      Last update: 2019-02-12 08:15    [W:2.365 / U:0.584 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site