[PATCH v2 3/3] mtd: lpddr: Move function print_drs_error to lpddr_cmds.c

Gustavo A. R. Silva
2020-04-27T19:51:53Z

Function print_drs_error is only used in drivers/mtd/lpddr/lpddr_cmds.c
so, better to move it there.

Also, notice that there's no need for inline as the function is used
once. Lastly, fix the following checkpatch warning:

WARNING: Prefer 'unsigned int' to bare use of 'unsigned'
+static void print_drs_error(unsigned dsr)

Suggested-by: Joe Perches <joe@perches.com>
Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com>
---
Changes in v2:
- Remove inline from print_drs_error and update changelog text,
accordingly.

drivers/mtd/lpddr/lpddr_cmds.c | 28 ++++++++++++++++++++++++++++
include/linux/mtd/pfow.h | 28 ----------------------------
2 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/drivers/mtd/lpddr/lpddr_cmds.c b/drivers/mtd/lpddr/lpddr_cmds.c
index fb1cbc9a2870..ee063baed136 100644
--- a/drivers/mtd/lpddr/lpddr_cmds.c
+++ b/drivers/mtd/lpddr/lpddr_cmds.c
@@ -94,6 +94,34 @@ struct mtd_info *lpddr_cmdset(struct map_info *map)
}
EXPORT_SYMBOL(lpddr_cmdset);

+static void print_drs_error(unsigned int dsr)
+{
+ int prog_status = (dsr & DSR_RPS) >> 8;
+
+ if (!(dsr & DSR_AVAILABLE))
+ pr_notice("DSR.15: (0) Device not Available\n");
+ if ((prog_status & 0x03) == 0x03)
+ pr_notice("DSR.9,8: (11) Attempt to program invalid half with 41h command\n");
+ else if (prog_status & 0x02)
+ pr_notice("DSR.9,8: (10) Object Mode Program attempt in region with Control Mode data\n");
+ else if (prog_status & 0x01)
+ pr_notice("DSR.9,8: (01) Program attempt in region with Object Mode data\n");
+ if (!(dsr & DSR_READY_STATUS))
+ pr_notice("DSR.7: (0) Device is Busy\n");
+ if (dsr & DSR_ESS)
+ pr_notice("DSR.6: (1) Erase Suspended\n");
+ if (dsr & DSR_ERASE_STATUS)
+ pr_notice("DSR.5: (1) Erase/Blank check error\n");
+ if (dsr & DSR_PROGRAM_STATUS)
+ pr_notice("DSR.4: (1) Program Error\n");
+ if (dsr & DSR_VPPS)
+ pr_notice("DSR.3: (1) Vpp low detect, operation aborted\n");
+ if (dsr & DSR_PSS)
+ pr_notice("DSR.2: (1) Program suspended\n");
+ if (dsr & DSR_DPS)
+ pr_notice("DSR.1: (1) Aborted Erase/Program attempt on locked block\n");
+}
+
static int wait_for_ready(struct map_info *map, struct flchip *chip,
unsigned int chip_op_time)
{
diff --git a/include/linux/mtd/pfow.h b/include/linux/mtd/pfow.h
index cd21c6768065..b3eae82eb03c 100644
--- a/include/linux/mtd/pfow.h
+++ b/include/linux/mtd/pfow.h
@@ -121,32 +121,4 @@ static inline void send_pfow_command(struct map_info *map,
map_write(map, CMD(LPDDR_START_EXECUTION),
map->pfow_base + PFOW_COMMAND_EXECUTE);
}
-
-static inline void print_drs_error(unsigned dsr)
-{
- int prog_status = (dsr & DSR_RPS) >> 8;
-
- if (!(dsr & DSR_AVAILABLE))
- pr_notice("DSR.15: (0) Device not Available\n");
- if ((prog_status & 0x03) == 0x03)
- pr_notice("DSR.9,8: (11) Attempt to program invalid half with 41h command\n");
- else if (prog_status & 0x02)
- pr_notice("DSR.9,8: (10) Object Mode Program attempt in region with Control Mode data\n");
- else if (prog_status & 0x01)
- pr_notice("DSR.9,8: (01) Program attempt in region with Object Mode data\n");
- if (!(dsr & DSR_READY_STATUS))
- pr_notice("DSR.7: (0) Device is Busy\n");
- if (dsr & DSR_ESS)
- pr_notice("DSR.6: (1) Erase Suspended\n");
- if (dsr & DSR_ERASE_STATUS)
- pr_notice("DSR.5: (1) Erase/Blank check error\n");
- if (dsr & DSR_PROGRAM_STATUS)
- pr_notice("DSR.4: (1) Program Error\n");
- if (dsr & DSR_VPPS)
- pr_notice("DSR.3: (1) Vpp low detect, operation aborted\n");
- if (dsr & DSR_PSS)
- pr_notice("DSR.2: (1) Program suspended\n");
- if (dsr & DSR_DPS)
- pr_notice("DSR.1: (1) Aborted Erase/Program attempt on locked block\n");
-}
#endif /* __LINUX_MTD_PFOW_H */
--
2.26.0