diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2019-01-15 13:43:03 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2019-01-15 13:43:03 +0100 |
| commit | 7c2517c2444fdd5c2eceee330a03ff15d12602ca (patch) | |
| tree | 1770d5217d689f0513bb1534c7e4dfbf114800fc /drivers/mfd | |
| parent | cbc25b2b8488452085d3195dfc7164b00a265364 (diff) | |
| parent | 0473048c4fa5410b0c4a75f667f7b317e44c15df (diff) | |
| download | barebox-7c2517c2444fdd5c2eceee330a03ff15d12602ca.tar.gz barebox-7c2517c2444fdd5c2eceee330a03ff15d12602ca.tar.xz | |
Merge branch 'for-next/misc'
Diffstat (limited to 'drivers/mfd')
| -rw-r--r-- | drivers/mfd/rave-sp.c | 8 | ||||
| -rw-r--r-- | drivers/mfd/syscon.c | 2 |
2 files changed, 3 insertions, 7 deletions
diff --git a/drivers/mfd/rave-sp.c b/drivers/mfd/rave-sp.c index b7efb62617..1448c4143f 100644 --- a/drivers/mfd/rave-sp.c +++ b/drivers/mfd/rave-sp.c @@ -320,7 +320,6 @@ int rave_sp_exec(struct rave_sp *sp, unsigned char *data = __data; int command, ret = 0; u8 ackid; - uint64_t start = get_time_ns(); command = sp->variant->cmd.translate(data[0]); if (command < 0) @@ -340,12 +339,9 @@ int rave_sp_exec(struct rave_sp *sp, * is_timeout will implicitly poll serdev via poller * infrastructure */ - while (!is_timeout(start, SECOND) && !reply.received) - ; - - if (!reply.received) { + ret = wait_on_timeout(SECOND, reply.received); + if (ret) { dev_err(dev, "Command timeout\n"); - ret = -ETIMEDOUT; sp->reply = NULL; } diff --git a/drivers/mfd/syscon.c b/drivers/mfd/syscon.c index 957d9a7267..30ed65f737 100644 --- a/drivers/mfd/syscon.c +++ b/drivers/mfd/syscon.c @@ -176,7 +176,7 @@ static int syscon_probe(struct device_d *dev) syscon->base = IOMEM(res->start); dev->priv = syscon; - dev_dbg(dev, "map 0x%x-0x%x registered\n", res->start, res->end); + dev_dbg(dev, "map %pa-%pa registered\n", &res->start, &res->end); return 0; } |