From: akpm@linux-foundation.org
To: arno@natisbad.org, a.zummo@towertech.it, broonie@kernel.org,
grant.likely@linaro.org, linus.walleij@linaro.org,
mark.rutland@arm.com, peter.huewe@infineon.com,
treding@nvidia.com, uwe@kleine-koenig.org,
mm-commits@vger.kernel.org
Subject: [merged] rtc-rtc-isl12057-report-error-code-upon-failure-in-dev_err-calls.patch removed from -mm tree
Date: Thu, 11 Dec 2014 11:07:42 -0800 [thread overview]
Message-ID: <5489eb7e.6roTrFjbfMoZgNj5%akpm@linux-foundation.org> (raw)
The patch titled
Subject: drivers/rtc/rtc-isl12057.c: report error code upon failure in dev_err() calls
has been removed from the -mm tree. Its filename was
rtc-rtc-isl12057-report-error-code-upon-failure-in-dev_err-calls.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Arnaud Ebalard <arno@natisbad.org>
Subject: drivers/rtc/rtc-isl12057.c: report error code upon failure in dev_err() calls
As pointed out by Mark, it is generally useful to log the error code when
reporting a failure. This patch improves existing calls to dev_err() in
ISL12057 driver to also report error code.
Signed-off-by: Arnaud Ebalard <arno@natisbad.org>
Suggested-by: Mark Brown <broonie@kernel.org>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Alessandro Zummo <a.zummo@towertech.it>
Cc: Peter Huewe <peter.huewe@infineon.com>
Cc: Linus Walleij <linus.walleij@linaro.org>
Cc: Thierry Reding <treding@nvidia.com>
Cc: Grant Likely <grant.likely@linaro.org>
Acked-by: Uwe Kleine-König <uwe@kleine-koenig.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
drivers/rtc/rtc-isl12057.c | 22 ++++++++++++++--------
1 file changed, 14 insertions(+), 8 deletions(-)
diff -puN drivers/rtc/rtc-isl12057.c~rtc-rtc-isl12057-report-error-code-upon-failure-in-dev_err-calls drivers/rtc/rtc-isl12057.c
--- a/drivers/rtc/rtc-isl12057.c~rtc-rtc-isl12057-report-error-code-upon-failure-in-dev_err-calls
+++ a/drivers/rtc/rtc-isl12057.c
@@ -170,8 +170,8 @@ static int isl12057_rtc_read_time(struct
mutex_lock(&data->lock);
ret = regmap_read(data->regmap, ISL12057_REG_SR, &sr);
if (ret) {
- dev_err(dev, "%s: unable to read oscillator status flag\n",
- __func__);
+ dev_err(dev, "%s: unable to read oscillator status flag (%d)\n",
+ __func__, ret);
goto out;
} else {
if (sr & ISL12057_REG_SR_OSF) {
@@ -183,7 +183,8 @@ static int isl12057_rtc_read_time(struct
ret = regmap_bulk_read(data->regmap, ISL12057_REG_RTC_SC, regs,
ISL12057_RTC_SEC_LEN);
if (ret)
- dev_err(dev, "%s: unable to read RTC time\n", __func__);
+ dev_err(dev, "%s: unable to read RTC time section (%d)\n",
+ __func__, ret);
out:
mutex_unlock(&data->lock);
@@ -210,7 +211,8 @@ static int isl12057_rtc_set_time(struct
ret = regmap_bulk_write(data->regmap, ISL12057_REG_RTC_SC, regs,
ISL12057_RTC_SEC_LEN);
if (ret) {
- dev_err(dev, "%s: writing RTC time failed\n", __func__);
+ dev_err(dev, "%s: unable to write RTC time section (%d)\n",
+ __func__, ret);
goto out;
}
@@ -221,7 +223,8 @@ static int isl12057_rtc_set_time(struct
ret = regmap_update_bits(data->regmap, ISL12057_REG_SR,
ISL12057_REG_SR_OSF, 0);
if (ret < 0)
- dev_err(dev, "Unable to clear oscillator failure bit\n");
+ dev_err(dev, "%s: unable to clear osc. failure bit (%d)\n",
+ __func__, ret);
out:
mutex_unlock(&data->lock);
@@ -242,7 +245,8 @@ static int isl12057_check_rtc_status(str
ret = regmap_update_bits(regmap, ISL12057_REG_INT,
ISL12057_REG_INT_EOSC, 0);
if (ret < 0) {
- dev_err(dev, "Unable to enable oscillator\n");
+ dev_err(dev, "%s: unable to enable oscillator (%d)\n",
+ __func__, ret);
return ret;
}
@@ -250,7 +254,8 @@ static int isl12057_check_rtc_status(str
ret = regmap_update_bits(regmap, ISL12057_REG_SR,
ISL12057_REG_SR_A1F, 0);
if (ret < 0) {
- dev_err(dev, "Unable to clear alarm bit\n");
+ dev_err(dev, "%s: unable to clear alarm bit (%d)\n",
+ __func__, ret);
return ret;
}
@@ -284,7 +289,8 @@ static int isl12057_probe(struct i2c_cli
regmap = devm_regmap_init_i2c(client, &isl12057_rtc_regmap_config);
if (IS_ERR(regmap)) {
ret = PTR_ERR(regmap);
- dev_err(dev, "regmap allocation failed: %d\n", ret);
+ dev_err(dev, "%s: regmap allocation failed (%d)\n",
+ __func__, ret);
return ret;
}
_
Patches currently in -mm which might be from arno@natisbad.org are
origin.patch
rtc-rtc-isl12057-add-alarm-support-to-intersil-isl12057-rtc-driver.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
reply other threads:[~2014-12-11 19:07 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5489eb7e.6roTrFjbfMoZgNj5%akpm@linux-foundation.org \
--to=akpm@linux-foundation.org \
--cc=a.zummo@towertech.it \
--cc=arno@natisbad.org \
--cc=broonie@kernel.org \
--cc=grant.likely@linaro.org \
--cc=linus.walleij@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=mm-commits@vger.kernel.org \
--cc=peter.huewe@infineon.com \
--cc=treding@nvidia.com \
--cc=uwe@kleine-koenig.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox