From patchwork Thu Jan 15 00:55:57 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Morton X-Patchwork-Id: 5635891 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 75351C058D for ; Thu, 15 Jan 2015 00:58:51 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 8F60120158 for ; Thu, 15 Jan 2015 00:58:50 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 8A3CC2013D for ; Thu, 15 Jan 2015 00:58:49 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1YBYjh-000529-Uv; Thu, 15 Jan 2015 00:56:33 +0000 Received: from mail.linuxfoundation.org ([140.211.169.12]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1YBYjf-0004zT-J6 for linux-arm-kernel@lists.infradead.org; Thu, 15 Jan 2015 00:56:32 +0000 Received: from localhost (c-67-161-9-76.hsd1.ca.comcast.net [67.161.9.76]) by mail.linuxfoundation.org (Postfix) with ESMTPSA id E8FAB26; Thu, 15 Jan 2015 00:56:08 +0000 (UTC) Date: Wed, 14 Jan 2015 16:55:57 -0800 From: Andrew Morton To: Arnaud Ebalard Subject: Re: [PATCHv0 2/3] rtc: Add support for Abracon AB-RTCMC-32.768kHz-B5ZE-S3 I2C RTC chip Message-Id: <20150114165557.d44c5752.akpm@linux-foundation.org> In-Reply-To: <1ae63ab80cfb39305884bd0c2648a420ba3bc0a5.1421045942.git.arno@natisbad.org> References: <1ae63ab80cfb39305884bd0c2648a420ba3bc0a5.1421045942.git.arno@natisbad.org> X-Mailer: Sylpheed 2.7.1 (GTK+ 2.18.9; x86_64-redhat-linux-gnu) Mime-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150114_165631_714679_353B3A71 X-CRM114-Status: GOOD ( 17.95 ) X-Spam-Score: -2.3 (--) Cc: Mark Rutland , Alessandro Zummo , Pawel Moll , Arnd Bergmann , Stephen Warren , rtc-linux@googlegroups.com, Linus Walleij , Ian Campbell , linux-doc@vger.kernel.org, Rob Herring , Jason Gunthorpe , devicetree@vger.kernel.org, Mark Brown , linux-arm-kernel@lists.infradead.org, Rob Landley , Kumar Gala , Grant Likely , Peter Huewe , Thierry Reding , Guenter Roeck , Jason Cooper X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP On Mon, 12 Jan 2015 09:16:36 +0100 Arnaud Ebalard wrote: > This patch adds support for Abracon AB-RTCMC-32.768kHz-B5ZE-S3 > RTC/Calendar module w/ I2C interface. > > This supports includes RTC time reading and setting, Alarm (1 minute > accuracy) reading and setting, and battery low detection. The device > also supports frequency adjustment and two timers but those features > are currently not implemented in this driver. Due to alarm accuracy > limitation (and current lack of timer support in the driver), UIE > mode is not supported. > > ... > > +static int abb5zes3_probe(struct i2c_client *client, > + const struct i2c_device_id *id) > +{ > + struct device *dev = &client->dev; > + struct abb5zes3_rtc_data *data; > + struct regmap *regmap; > + int ret; > + > + if (!i2c_check_functionality(client->adapter, I2C_FUNC_I2C | > + I2C_FUNC_SMBUS_BYTE_DATA | > + I2C_FUNC_SMBUS_I2C_BLOCK)) > + return -ENODEV; > + > + regmap = devm_regmap_init_i2c(client, &abb5zes3_rtc_regmap_config); > + if (IS_ERR(regmap)) { > + ret = PTR_ERR(regmap); > + dev_err(dev, "%s: regmap allocation failed: %d\n", > + __func__, ret); > + return ret; > + } > + > + ret = abb5zes3_i2c_validate_chip(regmap); > + if (ret) > + return ret; > + > + data = devm_kzalloc(dev, sizeof(*data), GFP_KERNEL); > + if (!data) > + return -ENOMEM; > + > + mutex_init(&data->lock); > + data->regmap = regmap; > + dev_set_drvdata(dev, data); > + > + ret = abb5zes3_rtc_check_setup(dev); > + if (ret) > + return ret; > + > + if (client->irq > 0) { > + ret = devm_request_threaded_irq(dev, client->irq, NULL, > + _abb5zes3_rtc_interrupt, > + IRQF_SHARED|IRQF_ONESHOT, > + DRV_NAME, client); > + if (!ret) { > + device_init_wakeup(dev, true); > + data->irq = client->irq; > + dev_dbg(dev, "%s: irq %d used by RTC\n", __func__, > + client->irq); > + } else { > + dev_err(dev, "%s: irq %d unavailable (%d)\n", > + __func__, client->irq, ret); > + } > + } > + > + data->rtc = devm_rtc_device_register(dev, DRV_NAME, &rtc_ops, > + THIS_MODULE); > + ret = PTR_ERR_OR_ZERO(data->rtc); If devm_request_threaded_irq() returned an error, we just wiped that out here. I'd suggest consistently adding a few "return ret;" statements in this function. Something like this? --- a/drivers/rtc/rtc-ab-b5ze-s3.c~rtc-add-support-for-abracon-ab-rtcmc-32768khz-b5ze-s3-i2c-rtc-chip-fix +++ a/drivers/rtc/rtc-ab-b5ze-s3.c @@ -695,6 +695,7 @@ static int abb5zes3_probe(struct i2c_cli } else { dev_err(dev, "%s: irq %d unavailable (%d)\n", __func__, client->irq, ret); + return ret; } } @@ -704,7 +705,7 @@ static int abb5zes3_probe(struct i2c_cli if (ret) { dev_err(dev, "%s: unable to register RTC device (%d)\n", __func__, ret); - device_init_wakeup(dev, false); + goto err; } /* @@ -718,12 +719,17 @@ static int abb5zes3_probe(struct i2c_cli /* Enable battery low detection interrupt if battery not already low */ if (!data->battery_low && data->irq) { ret = _abb5zes3_rtc_battery_low_irq_enable(regmap, true); - if (ret) + if (ret) { dev_err(dev, "%s: enabling battery low interrupt " "generation failed (%d)\n", __func__, ret); + goto err; + } } return ret; +err: + device_init_wakeup(dev, false); + return ret; } static int abb5zes3_remove(struct i2c_client *client)