From patchwork Sun Mar 6 15:27:50 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Akinobu Mita X-Patchwork-Id: 592559 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from mail-yw0-x238.google.com (mail-yw0-x238.google.com [IPv6:2607:f8b0:4002:c05::238]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 726C31402D9 for ; Mon, 7 Mar 2016 02:28:23 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=googlegroups.com header.i=@googlegroups.com header.b=Os0OeB9w; dkim-atps=neutral Received: by mail-yw0-x238.google.com with SMTP id f2sf6260569ywe.1 for ; Sun, 06 Mar 2016 07:28:23 -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=SDo2w7J2YBf3+jOt4JQfG6W9DgKE+sUv8cNegYFbH34=; b=Os0OeB9wk11FAvns8Ll88kYuz7F7JTK4uksk+Dg2/y3+ahBAHR2viECNosqc1N977m Inq2uioGHaHEW2fNIDpeDBn3IB19ZRdt/rmyfONSIZ2KOjfMtZz5d//pg3HWaBCfysDf umhFHFu8fdwhlNNb0dK6k25Pn+DEdQ7jxwy5SYhemGIh5jkpejAMrk+KVIeZrcJbXMOu o9E73MoR2XRtBktO+/aa70HczCnxcETPIi3rNPEkIEms8hcXi/VQWrtgxaldjrAPPnOE hWCUT7+Y5W8tzam2qx4LCHIfc7t5Ohp/jrA+dfz4/217Amz35WJwmFKQ4ymFt3X0yjUU uJmw== 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=SDo2w7J2YBf3+jOt4JQfG6W9DgKE+sUv8cNegYFbH34=; b=HoLCubaLW40Da9Y4dA1Wd29x1BNKC7jsNXk3cI6ti5RvA/hJHAaHWsz0Sd2z1gmp0l hKehey32LcpIqAP6L2h+/LpKMCLSHOKvUi0kvdqhGrfxb+KeC965k4eSnowlqVfSgFhw 6BX07tCv0UBhaNp2AXm6uO6vpoCcx2CuBacuQwOVevZGaPN4kcZ/melb99oSpPFYvgSu kjGPSnpI1xHXNTjMvef7mgIZIOhXb1Bvij6goi9uJ1Blq4kO0eNK9DcfdJP6spCUS+pM sykEbCZqz0Dt8xt5zI8tGAGiAZdVJP+pB5TdYA/IWpTtf12nF6y3p3RkIwOub4ZDl+JS rEZA== X-Gm-Message-State: AD7BkJLftDe9z//tICeRN9Y6JrFSgtVnT0I1wgT2cfkSrIZl147xib+jd8hq/AJ7/CuN8A== X-Received: by 10.140.19.208 with SMTP id 74mr422031qgh.9.1457278101439; Sun, 06 Mar 2016 07:28:21 -0800 (PST) MIME-Version: 1.0 X-BeenThere: rtc-linux@googlegroups.com Received: by 10.140.35.229 with SMTP id n92ls1200032qgn.58.gmail; Sun, 06 Mar 2016 07:28:20 -0800 (PST) X-Received: by 10.13.225.8 with SMTP id k8mr13166377ywe.37.1457278100908; Sun, 06 Mar 2016 07:28:20 -0800 (PST) Received: from mail-pf0-x244.google.com (mail-pf0-x244.google.com. [2607:f8b0:400e:c00::244]) by gmr-mx.google.com with ESMTPS id ui7si2482805pab.0.2016.03.06.07.28.20 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 06 Mar 2016 07:28:20 -0800 (PST) Received-SPF: pass (google.com: domain of akinobu.mita@gmail.com designates 2607:f8b0:400e:c00::244 as permitted sender) client-ip=2607:f8b0:400e:c00::244; Received: by mail-pf0-x244.google.com with SMTP id 63so6437318pfe.0 for ; Sun, 06 Mar 2016 07:28:20 -0800 (PST) X-Received: by 10.98.42.20 with SMTP id q20mr27522949pfq.146.1457278100751; Sun, 06 Mar 2016 07:28:20 -0800 (PST) Received: from localhost.localdomain (KD113159139091.ppp-bb.dion.ne.jp. [113.159.139.91]) by smtp.gmail.com with ESMTPSA id g74sm18432196pfj.1.2016.03.06.07.28.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 06 Mar 2016 07:28:19 -0800 (PST) From: Akinobu Mita To: rtc-linux@googlegroups.com Cc: Akinobu Mita , Alessandro Zummo , Alexandre Belloni , Dennis Aberilla Subject: [rtc-linux] [PATCH v4 4/7] rtc: ds3232: add register access error checks Date: Mon, 7 Mar 2016 00:27:50 +0900 Message-Id: <1457278073-11627-4-git-send-email-akinobu.mita@gmail.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1457278073-11627-1-git-send-email-akinobu.mita@gmail.com> References: <1457278073-11627-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:c00::244 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 --- * No changes from the previous version drivers/rtc/rtc-ds3232.c | 29 ++++++++++++++++++++++------- 1 file changed, 22 insertions(+), 7 deletions(-) diff --git a/drivers/rtc/rtc-ds3232.c b/drivers/rtc/rtc-ds3232.c index b27acea..bb891b9 100644 --- a/drivers/rtc/rtc-ds3232.c +++ b/drivers/rtc/rtc-ds3232.c @@ -262,6 +262,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; @@ -272,7 +274,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; @@ -308,10 +310,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) @@ -321,9 +325,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) @@ -364,11 +366,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);