From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753533AbbBYPaw (ORCPT ); Wed, 25 Feb 2015 10:30:52 -0500 Received: from mail-wg0-f42.google.com ([74.125.82.42]:36077 "EHLO mail-wg0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751479AbbBYPav (ORCPT ); Wed, 25 Feb 2015 10:30:51 -0500 Date: Wed, 25 Feb 2015 15:30:38 +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 Subject: Re: [PATCH 2/2] mfd: sec: Cleanup unused RTC fields: ono, WTSR and SMPL Message-ID: <20150225153038.GB6688@x1> References: <1423221888-32052-1-git-send-email-k.kozlowski@samsung.com> <1423221888-32052-3-git-send-email-k.kozlowski@samsung.com> <20150225152921.GA6688@x1> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20150225152921.GA6688@x1> 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 Wed, 25 Feb 2015, Lee Jones wrote: > On Fri, 06 Feb 2015, 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(-) > > > > 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); > > - } > > This change doesn't have anything to do with removing the WTSR and > SMPL. > > Once you've seperated this out, send both patches with my: > > Acked-by: Lee Jones Don't forget to send the RTC patch too, or I'll forget to apply it. -- Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog