From patchwork Mon Feb 29 15:13:49 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Akinobu Mita X-Patchwork-Id: 589998 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from mail-pa0-x239.google.com (mail-pa0-x239.google.com [IPv6:2607:f8b0:400e:c03::239]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id BA0AD140770 for ; Tue, 1 Mar 2016 02:14:26 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=googlegroups.com header.i=@googlegroups.com header.b=xab/kyfG; dkim-atps=neutral Received: by mail-pa0-x239.google.com with SMTP id zv9sf20901002pab.1 for ; Mon, 29 Feb 2016 07:14:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20120806; h=mime-version:from:to:cc:subject:date:message-id:in-reply-to :references:x-original-sender:x-original-authentication-results :reply-to:precedence:mailing-list:list-id:x-spam-checked-in-group :list-post:list-help:list-archive:sender:list-subscribe :list-unsubscribe; bh=I8u+Gov9RFgi1ruH06v8BL4qvhqmQkSXIDsXp6GEAIo=; b=xab/kyfG8t4GNgNr0AEn6iRtkD8ZpAT2Uts7tTZWwpbKksEwT7AKZpV1s5csrE6KPv 6lRe8sjOrGPp/0RPM50xNOllNPZjIFN6L7Qchxhb5ollpDYvzX3d1RoKkKJ6XNR47kMF ORaRgivHwc1EEAgY2xBjuNvgQDWDtYp01gwOooQ9F/XN0AfG2rGN0jiMcbusK5VeFr7v DbhZ8t4PZUWZfuG91HxAOOzq+NdXRRA9WQwjNdsEJzXbvlquXpLt3nEP3KNB09dsHI3y hqy5QJOFrMXqHqK0+E9/uQSXo9b1Narz/UBLuFOy0yhXcp4Z9GCYaKAy8ahfHgLBtsWm QlYg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:from:to:cc:subject:date:message-id :in-reply-to:references:x-original-sender :x-original-authentication-results:reply-to:precedence:mailing-list :list-id:x-spam-checked-in-group:list-post:list-help:list-archive :sender:list-subscribe:list-unsubscribe; bh=I8u+Gov9RFgi1ruH06v8BL4qvhqmQkSXIDsXp6GEAIo=; b=FecIffTWEscJKcm7RcOzrjkCRLfeI1HRz5Uqc+brCJkQlUie1/xWlhcd44mdLApE0G /fmFxVwOV9k27ydYPmqYX4Xu9BKrBt6G9ncha6iE/9FHqIpivbQ8Xi+NPYh2gI5fkjp5 p4hWopawB9QKD7k/130ejv9Iy2k0dRzDWvMExqaaWxnftb9ayil0CTSfdyIF+ysuzM46 zu8c414xJFqaeQH86pEIDNRWJ5c5Shnv4CmM9SrIIc0qfEfDebfpTB0v1EMGRqv2kojd /5V9b+x6a7OZkuJ5RxykH5XgeRo1jTq2PEPboD5iz76yPBIWa+ftn9Dk5PjJNZUiUss0 43gA== X-Gm-Message-State: AD7BkJKVpQQc6hCGWTEVSlMeQGpWcz5RWVJYmIl8zd1+eROe5xDfVVAXjqHOU3vPzaSKTg== X-Received: by 10.50.110.41 with SMTP id hx9mr175438igb.2.1456758865155; Mon, 29 Feb 2016 07:14:25 -0800 (PST) MIME-Version: 1.0 X-BeenThere: rtc-linux@googlegroups.com Received: by 10.50.66.37 with SMTP id c5ls510081igt.22.canary; Mon, 29 Feb 2016 07:14:24 -0800 (PST) X-Received: by 10.50.20.135 with SMTP id n7mr10382284ige.5.1456758864915; Mon, 29 Feb 2016 07:14:24 -0800 (PST) Received: from mail-pa0-x22c.google.com (mail-pa0-x22c.google.com. [2607:f8b0:400e:c03::22c]) by gmr-mx.google.com with ESMTPS id ui7si3698544pab.0.2016.02.29.07.14.24 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 29 Feb 2016 07:14:24 -0800 (PST) Received-SPF: pass (google.com: domain of akinobu.mita@gmail.com designates 2607:f8b0:400e:c03::22c as permitted sender) client-ip=2607:f8b0:400e:c03::22c; Received: by mail-pa0-x22c.google.com with SMTP id bj10so24176316pad.2 for ; Mon, 29 Feb 2016 07:14:24 -0800 (PST) X-Received: by 10.67.4.1 with SMTP id ca1mr22307814pad.7.1456758864781; Mon, 29 Feb 2016 07:14:24 -0800 (PST) Received: from localhost.localdomain (KD113159139091.ppp-bb.dion.ne.jp. [113.159.139.91]) by smtp.gmail.com with ESMTPSA id g10sm38866329pfd.92.2016.02.29.07.14.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 29 Feb 2016 07:14:23 -0800 (PST) From: Akinobu Mita To: rtc-linux@googlegroups.com Cc: Akinobu Mita , Alessandro Zummo , Alexandre Belloni , Dennis Aberilla Subject: [rtc-linux] [PATCH v3 5/8] rtc: ds3232-core: add register access error checks Date: Tue, 1 Mar 2016 00:13:49 +0900 Message-Id: <1456758832-10590-5-git-send-email-akinobu.mita@gmail.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1456758832-10590-1-git-send-email-akinobu.mita@gmail.com> References: <1456758832-10590-1-git-send-email-akinobu.mita@gmail.com> X-Original-Sender: Akinobu.Mita@gmail.com X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of akinobu.mita@gmail.com designates 2607:f8b0:400e:c03::22c as permitted sender) smtp.mailfrom=akinobu.mita@gmail.com; dkim=pass header.i=@gmail.com; dmarc=pass (p=NONE dis=NONE) header.from=gmail.com Reply-To: rtc-linux@googlegroups.com Precedence: list Mailing-list: list rtc-linux@googlegroups.com; contact rtc-linux+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: rtc-linux@googlegroups.com X-Google-Group-Id: 712029733259 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , Add missing register access error checks and make it return error code or print error message. Signed-off-by: Akinobu Mita Cc: Alessandro Zummo Cc: Alexandre Belloni Cc: Dennis Aberilla --- * New patch from this version drivers/rtc/rtc-ds3232-core.c | 29 ++++++++++++++++++++++------- 1 file changed, 22 insertions(+), 7 deletions(-) diff --git a/drivers/rtc/rtc-ds3232-core.c b/drivers/rtc/rtc-ds3232-core.c index 7de30b3..bcce75b 100644 --- a/drivers/rtc/rtc-ds3232-core.c +++ b/drivers/rtc/rtc-ds3232-core.c @@ -261,6 +261,8 @@ static int ds3232_set_alarm(struct device *dev, struct rtc_wkalrm *alarm) goto out; ret = regmap_bulk_write(ds3232->regmap, DS3232_REG_ALARM1, buf, 4); + if (ret) + goto out; if (alarm->enabled) { control |= DS3232_REG_CR_A1IE; @@ -271,7 +273,7 @@ out: return ret; } -static void ds3232_update_alarm(struct device *dev, unsigned int enabled) +static int ds3232_update_alarm(struct device *dev, unsigned int enabled) { struct ds3232 *ds3232 = dev_get_drvdata(dev); int control; @@ -307,10 +309,12 @@ static void ds3232_update_alarm(struct device *dev, unsigned int enabled) else /* disable alarm1 interrupt */ control &= ~(DS3232_REG_CR_A1IE); - regmap_write(ds3232->regmap, DS3232_REG_CR, control); + ret = regmap_write(ds3232->regmap, DS3232_REG_CR, control); unlock: mutex_unlock(&ds3232->mutex); + + return ret; } static int ds3232_alarm_irq_enable(struct device *dev, unsigned int enabled) @@ -320,9 +324,7 @@ static int ds3232_alarm_irq_enable(struct device *dev, unsigned int enabled) if (ds3232->irq <= 0) return -EINVAL; - ds3232_update_alarm(dev, enabled); - - return 0; + return ds3232_update_alarm(dev, enabled); } static irqreturn_t ds3232_irq(int irq, void *dev_id) @@ -363,11 +365,24 @@ static void ds3232_work(struct work_struct *work) } else { /* disable alarm1 interrupt */ control &= ~(DS3232_REG_CR_A1IE); - regmap_write(ds3232->regmap, DS3232_REG_CR, control); + ret = regmap_write(ds3232->regmap, DS3232_REG_CR, + control); + if (ret) { + dev_warn(ds3232->dev, + "Write Control Register error %d\n", + ret); + goto unlock; + } /* clear the alarm pend flag */ stat &= ~DS3232_REG_SR_A1F; - regmap_write(ds3232->regmap, DS3232_REG_SR, stat); + ret = regmap_write(ds3232->regmap, DS3232_REG_SR, stat); + if (ret) { + dev_warn(ds3232->dev, + "Write Status Register error %d\n", + ret); + goto unlock; + } rtc_update_irq(ds3232->rtc, 1, RTC_AF | RTC_IRQF);