From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753039AbbBXKUh (ORCPT ); Tue, 24 Feb 2015 05:20:37 -0500 Received: from mail-we0-f180.google.com ([74.125.82.180]:38074 "EHLO mail-we0-f180.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751436AbbBXKUf (ORCPT ); Tue, 24 Feb 2015 05:20:35 -0500 Date: Tue, 24 Feb 2015 10:20:28 +0000 From: Lee Jones To: Krzysztof Kozlowski Cc: Sangbeom Kim , Samuel Ortiz , Alessandro Zummo , linux-kernel@vger.kernel.org, rtc-linux@googlegroups.com, Kyungmin Park , Bartlomiej Zolnierkiewicz , Marek Szyprowski , akpm@linux-foundation.org Subject: Re: [PATCH 2/2] mfd: sec: Cleanup unused RTC fields: ono, WTSR and SMPL Message-ID: <20150224102028.GB21323@x1> References: <1423221888-32052-1-git-send-email-k.kozlowski@samsung.com> <1423221888-32052-3-git-send-email-k.kozlowski@samsung.com> <1424764212.7479.4.camel@AMDC1943> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <1424764212.7479.4.camel@AMDC1943> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, 24 Feb 2015, Krzysztof Kozlowski wrote: > On pią, 2015-02-06 at 12:24 +0100, Krzysztof Kozlowski wrote: > > The WTSR (Watchdog Timer Software Reset) and SMPL (Sudden Momentary > > Power Loss) were removed from rtc-s5m driver because they were not used. > > Remove them (and on/off interrupt) from main MFD driver and header. > > > > Additionally remove ENOMEM error message. > > > > Signed-off-by: Krzysztof Kozlowski > > --- > > drivers/mfd/sec-core.c | 5 +---- > > include/linux/mfd/samsung/core.h | 9 --------- > > 2 files changed, 1 insertion(+), 13 deletions(-) > > Dear Lee, > > This patch depends on 1/2 which was picked by Andrew Morton: > http://ozlabs.org/~akpm/mmots/broken-out/rtc-s5m-remove-unused-watchdog-and-sudden-momentary-power-loss.patch > > If this looks OK to you, maybe you could ack it and this patch would > also go through Andrew's tree? Don't worry about the MM tree. Once I pick both patches, they will be automatically removed. > > diff --git a/drivers/mfd/sec-core.c b/drivers/mfd/sec-core.c > > index 0a7bc43db4e4..2253d44e631c 100644 > > --- a/drivers/mfd/sec-core.c > > +++ b/drivers/mfd/sec-core.c > > @@ -267,10 +267,8 @@ static struct sec_platform_data *sec_pmic_i2c_parse_dt_pdata( > > struct sec_platform_data *pd; > > > > pd = devm_kzalloc(dev, sizeof(*pd), GFP_KERNEL); > > - if (!pd) { > > - dev_err(dev, "could not allocate memory for pdata\n"); > > + if (!pd) > > return ERR_PTR(-ENOMEM); > > - } > > > > /* > > * ToDo: the 'wakeup' member in the platform data is more of a linux > > @@ -333,7 +331,6 @@ static int sec_pmic_probe(struct i2c_client *i2c, > > } > > if (pdata) { > > sec_pmic->device_type = pdata->device_type; > > - sec_pmic->ono = pdata->ono; > > sec_pmic->irq_base = pdata->irq_base; > > sec_pmic->wakeup = pdata->wakeup; > > sec_pmic->pdata = pdata; > > diff --git a/include/linux/mfd/samsung/core.h b/include/linux/mfd/samsung/core.h > > index 3fdb7cfbffb3..75115384f3fc 100644 > > --- a/include/linux/mfd/samsung/core.h > > +++ b/include/linux/mfd/samsung/core.h > > @@ -58,13 +58,7 @@ enum sec_device_type { > > * @irq_base: Base IRQ number for device, required for IRQs > > * @irq: Generic IRQ number for device > > * @irq_data: Runtime data structure for IRQ controller > > - * @ono: Power onoff IRQ number for s5m87xx > > * @wakeup: Whether or not this is a wakeup device > > - * @wtsr_smpl: Whether or not to enable in RTC driver the Watchdog > > - * Timer Software Reset (registers set to default value > > - * after PWRHOLD falling) and Sudden Momentary Power Loss > > - * (PMIC will enter power on sequence after short drop in > > - * VBATT voltage). > > */ > > struct sec_pmic_dev { > > struct device *dev; > > @@ -77,9 +71,7 @@ struct sec_pmic_dev { > > int irq; > > struct regmap_irq_chip_data *irq_data; > > > > - int ono; > > bool wakeup; > > - bool wtsr_smpl; > > }; > > > > int sec_irq_init(struct sec_pmic_dev *sec_pmic); > > @@ -95,7 +87,6 @@ struct sec_platform_data { > > int irq_base; > > int (*cfg_pmic_irq)(void); > > > > - int ono; > > bool wakeup; > > bool buck_voltage_lock; > > > -- Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog