From patchwork Fri Feb 15 12:56:43 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 2147671 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork1.kernel.org (Postfix) with ESMTP id D1D2B3FCF6 for ; Fri, 15 Feb 2013 13:18:12 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1U6L8K-0007rY-6L; Fri, 15 Feb 2013 13:15:20 +0000 Received: from mail-we0-x235.google.com ([2a00:1450:400c:c03::235]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1U6KrO-000804-Jx for linux-arm-kernel@lists.infradead.org; Fri, 15 Feb 2013 12:57:52 +0000 Received: by mail-we0-f181.google.com with SMTP id t44so2852691wey.40 for ; Fri, 15 Feb 2013 04:57:44 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references:x-gm-message-state; bh=+lK+JWNoWs8MnfS0Gsf/JVrSbe1bgRjC42/CcsFWv4w=; b=D9/nFfH5DH6YOazUgYbg7xiwlELDohWwHn/MeU3Zxw6MSkuXx8n7/vbNd9dgjVrdQr zz6i27/FLIlWo+OVg9rGPofKjHIUo4uAs3Pmoxm7bSMk31eMS5gUmcUyTyjKJomgua1u APNL8wKwFzhz4W1CDe+QN1czVegmN7CUfj3LP0EUs2p1cqEsEaq7OsQUaCFJ84TYeSAE 9d9kijFyddAvE0Dl/YxKoFBYdkCfImfo0Kp/wRqiQYjmWYzKfcArDlD7RQKEyt1eGSfE L/OxCoLjjiQnRNCajVxbnr+iDKaBeNLPY52bFFS35DxTM9+CEeRTb7o1/wZNEqx35ok5 piOQ== X-Received: by 10.194.238.226 with SMTP id vn2mr4039699wjc.23.1360933064420; Fri, 15 Feb 2013 04:57:44 -0800 (PST) Received: from localhost.localdomain (cpc34-aztw25-2-0-cust250.18-1.cable.virginmedia.com. [86.16.136.251]) by mx.google.com with ESMTPS id j4sm2852410wiz.10.2013.02.15.04.57.42 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 15 Feb 2013 04:57:43 -0800 (PST) From: Lee Jones To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, sameo@linux.intel.com Subject: [PATCH 12/35] mfd: ab8500-debug: Better error handling on crash Date: Fri, 15 Feb 2013 12:56:43 +0000 Message-Id: <1360933026-30325-13-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1360933026-30325-1-git-send-email-lee.jones@linaro.org> References: <1360933026-30325-1-git-send-email-lee.jones@linaro.org> X-Gm-Message-State: ALoCoQkB9HhGB2DlOwKivc4Z5UXZi/utpgkud5VB7zwxYgEgsXS7SHdMmM4mv26fygO74jkWQAkQ X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130215_075751_145151_0BDD68C2 X-CRM114-Status: GOOD ( 12.00 ) X-Spam-Score: -1.9 (-) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-1.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Jonas Aaberg , Lee Jones , linus.walleij@stericsson.com, arnd@arndb.de X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org From: Jonas Aaberg Stop trying to read i2c registers if one fail. Signed-off-by: Jonas Aaberg Signed-off-by: Lee Jones Reviewed-by: Mattias WALLIN --- drivers/mfd/ab8500-debugfs.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/drivers/mfd/ab8500-debugfs.c b/drivers/mfd/ab8500-debugfs.c index 250b77b..8b15fc2 100644 --- a/drivers/mfd/ab8500-debugfs.c +++ b/drivers/mfd/ab8500-debugfs.c @@ -607,7 +607,6 @@ struct ab8500_register_dump u8 bank; u8 reg; u8 value; - int ret; } ab8500_complete_register_dump[DUMP_MAX_REGS]; extern int prcmu_abb_read(u8 slave, u8 reg, u8 *value, u8 size); @@ -617,6 +616,7 @@ void ab8500_dump_all_banks_to_mem(void) { int i, r = 0; u8 bank; + int err = 0; pr_info("Saving all ABB registers at \"ab8500_complete_register_dump\" " "for crash analyze.\n"); @@ -629,11 +629,12 @@ void ab8500_dump_all_banks_to_mem(void) reg <= debug_ranges[bank].range[i].last; reg++) { u8 value; - int err; err = prcmu_abb_read(bank, reg, &value, 1); - ab8500_complete_register_dump[r].ret = err; + if (err < 0) + goto out; + ab8500_complete_register_dump[r].bank = bank; ab8500_complete_register_dump[r].reg = reg; ab8500_complete_register_dump[r].value = value; @@ -643,11 +644,17 @@ void ab8500_dump_all_banks_to_mem(void) if (r >= DUMP_MAX_REGS) { pr_err("%s: too many register to dump!\n", __func__); - return; + err = -EINVAL; + goto out; } } } } +out: + if (err >= 0) + pr_info("Saved all ABB registers.\n"); + else + pr_info("Failed to save all ABB registers.\n"); } static int ab8500_all_banks_open(struct inode *inode, struct file *file)