[RFT,v2,20/29] memory: omap-gpmc: Return meaningful error codes in gpmc_cs_set_timings()
diff mbox series

Message ID 20200724074038.5597-21-krzk@kernel.org
State New
Headers show
Series
  • *memory: Cleanup, improve and compile test memory drivers
Related show

Commit Message

Krzysztof Kozlowski July 24, 2020, 7:40 a.m. UTC
The callers of gpmc_cs_set_timings() expect to receive -ERRNO on errors
and they pass further what they have received.

However gpmc_cs_set_timings() was returning -1 (equal to -EPERM) which
does not make sense in this context.

Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>

---

Not tested

Changes since v1:
1. New patch
---
 drivers/memory/omap-gpmc.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Comments

Krzysztof Kozlowski Aug. 17, 2020, 6:32 p.m. UTC | #1
On Fri, Jul 24, 2020 at 09:40:29AM +0200, Krzysztof Kozlowski wrote:
> The callers of gpmc_cs_set_timings() expect to receive -ERRNO on errors
> and they pass further what they have received.
> 
> However gpmc_cs_set_timings() was returning -1 (equal to -EPERM) which
> does not make sense in this context.
> 
> Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
> 
> ---

Applied to drivers/memory tree.

Best regards,
Krzysztof

Patch
diff mbox series

diff --git a/drivers/memory/omap-gpmc.c b/drivers/memory/omap-gpmc.c
index c158b6cae9a9..1e370142dfca 100644
--- a/drivers/memory/omap-gpmc.c
+++ b/drivers/memory/omap-gpmc.c
@@ -638,7 +638,7 @@  static int set_gpmc_timing_reg(int cs, int reg, int st_bit, int end_bit, int max
 #define GPMC_SET_ONE_CD_MAX(reg, st, end, max, field, cd)  \
 	if (set_gpmc_timing_reg(cs, (reg), (st), (end), (max), \
 	    t->field, (cd), #field) < 0)                       \
-		return -1
+		return -ENXIO
 
 #define GPMC_SET_ONE(reg, st, end, field) \
 	GPMC_SET_ONE_CD_MAX(reg, st, end, 0, field, GPMC_CD_FCLK)
@@ -708,7 +708,7 @@  int gpmc_cs_set_timings(int cs, const struct gpmc_timings *t,
 
 	div = gpmc_calc_divider(t->sync_clk);
 	if (div < 0)
-		return div;
+		return -EINVAL;
 
 	/*
 	 * See if we need to change the divider for waitmonitoringtime.
@@ -733,7 +733,7 @@  int gpmc_cs_set_timings(int cs, const struct gpmc_timings *t,
 			       __func__,
 			       t->wait_monitoring
 			       );
-			return -1;
+			return -ENXIO;
 		}
 	}