diff options
| author | Boris Brezillon <boris.brezillon@bootlin.com> | 2018-11-11 08:55:10 +0100 |
|---|---|---|
| committer | Miquel Raynal <miquel.raynal@bootlin.com> | 2018-12-07 10:38:24 +0100 |
| commit | d54445d664a1324785f40f6fd4240b7a024f4b19 (patch) | |
| tree | a35d1a974fa27566993c44ee237add08fb0cce29 /drivers/mtd/nand/raw/ams-delta.c | |
| parent | 4857393d5655b93e0e7368c12bbcf1d79883155c (diff) | |
| download | linux-d54445d664a1324785f40f6fd4240b7a024f4b19.tar.bz2 | |
mtd: rawnand: ams-delta: Fix various coding style issues
Most of them were reported by checkpatch:
* s/u_char/u8/
* remove unneeded blank lines
* don't print warning messages when devm_kzalloc() fails
* Use ! instead of == NULL
* Remove invalid comment
Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com>
Tested-by: Janusz Krzysztofik <jmkrzyszt@gmail.com>
Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
Diffstat (limited to 'drivers/mtd/nand/raw/ams-delta.c')
| -rw-r--r-- | drivers/mtd/nand/raw/ams-delta.c | 23 |
1 files changed, 8 insertions, 15 deletions
diff --git a/drivers/mtd/nand/raw/ams-delta.c b/drivers/mtd/nand/raw/ams-delta.c index 4862d4df1a15..07ee513318ec 100644 --- a/drivers/mtd/nand/raw/ams-delta.c +++ b/drivers/mtd/nand/raw/ams-delta.c @@ -28,7 +28,6 @@ /* * MTD structure for E3 (Delta) */ - struct ams_delta_nand { struct nand_chip nand_chip; struct gpio_desc *gpiod_rdy; @@ -67,7 +66,7 @@ static const struct mtd_partition partition_info[] = { .size = 3 * SZ_256K }, }; -static void ams_delta_io_write(struct ams_delta_nand *priv, u_char byte) +static void ams_delta_io_write(struct ams_delta_nand *priv, u8 byte) { writew(byte, priv->io_base + OMAP_MPUIO_OUTPUT); gpiod_set_value(priv->gpiod_nwe, 0); @@ -75,9 +74,9 @@ static void ams_delta_io_write(struct ams_delta_nand *priv, u_char byte) gpiod_set_value(priv->gpiod_nwe, 1); } -static u_char ams_delta_io_read(struct ams_delta_nand *priv) +static u8 ams_delta_io_read(struct ams_delta_nand *priv) { - u_char res; + u8 res; gpiod_set_value(priv->gpiod_nre, 0); ndelay(40); @@ -93,7 +92,7 @@ static void ams_delta_dir_input(struct ams_delta_nand *priv, bool in) priv->data_in = in; } -static void ams_delta_write_buf(struct ams_delta_nand *priv, const u_char *buf, +static void ams_delta_write_buf(struct ams_delta_nand *priv, const u8 *buf, int len) { int i; @@ -105,8 +104,7 @@ static void ams_delta_write_buf(struct ams_delta_nand *priv, const u_char *buf, ams_delta_io_write(priv, buf[i]); } -static void ams_delta_read_buf(struct ams_delta_nand *priv, u_char *buf, - int len) +static void ams_delta_read_buf(struct ams_delta_nand *priv, u8 *buf, int len) { int i; @@ -138,7 +136,6 @@ static int ams_delta_exec_op(struct nand_chip *this, return 0; for (instr = op->instrs; instr < op->instrs + op->ninstrs; instr++) { - switch (instr->type) { case NAND_OP_CMD_INSTR: gpiod_set_value(priv->gpiod_cle, 1); @@ -179,7 +176,6 @@ static int ams_delta_exec_op(struct nand_chip *this, return ret; } - /* * Main initialization routine */ @@ -198,10 +194,9 @@ static int ams_delta_init(struct platform_device *pdev) /* Allocate memory for MTD device structure and private data */ priv = devm_kzalloc(&pdev->dev, sizeof(struct ams_delta_nand), GFP_KERNEL); - if (!priv) { - pr_warn("Unable to allocate E3 NAND MTD device structure.\n"); + if (!priv) return -ENOMEM; - } + this = &priv->nand_chip; mtd = nand_to_mtd(this); @@ -212,9 +207,8 @@ static int ams_delta_init(struct platform_device *pdev) * it should have been already requested from the * gpio-omap driver and requesting it again would fail. */ - io_base = ioremap(res->start, resource_size(res)); - if (io_base == NULL) { + if (!io_base) { dev_err(&pdev->dev, "ioremap failed\n"); err = -EIO; goto out_free; @@ -223,7 +217,6 @@ static int ams_delta_init(struct platform_device *pdev) priv->io_base = io_base; nand_set_controller_data(this, priv); - /* Set address of NAND IO lines */ this->select_chip = ams_delta_select_chip; this->exec_op = ams_delta_exec_op; |