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 <k.kozlow...@samsung.com>
> > ---
> > 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 <lee.jo...@linaro.org>
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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
