From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753023AbbBFLZo (ORCPT ); Fri, 6 Feb 2015 06:25:44 -0500 Received: from mailout2.w1.samsung.com ([210.118.77.12]:45462 "EHLO mailout2.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751334AbbBFLZN (ORCPT ); Fri, 6 Feb 2015 06:25:13 -0500 X-AuditID: cbfec7f4-b7f126d000001e9a-53-54d4a405bd06 From: Krzysztof Kozlowski To: Sangbeom Kim , Samuel Ortiz , Lee Jones , Alessandro Zummo , linux-kernel@vger.kernel.org, rtc-linux@googlegroups.com Cc: Kyungmin Park , Bartlomiej Zolnierkiewicz , Marek Szyprowski , Krzysztof Kozlowski Subject: [PATCH 2/2] mfd: sec: Cleanup unused RTC fields: ono, WTSR and SMPL Date: Fri, 06 Feb 2015 12:24:48 +0100 Message-id: <1423221888-32052-3-git-send-email-k.kozlowski@samsung.com> X-Mailer: git-send-email 1.9.1 In-reply-to: <1423221888-32052-1-git-send-email-k.kozlowski@samsung.com> References: <1423221888-32052-1-git-send-email-k.kozlowski@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupkluLIzCtJLcpLzFFi42I5/e/4FV3WJVdCDH7/N7RYcvEqu8XGGetZ LV6/MLQ42/SG3eL+16OMFpd3zWGzWHvkLrvF/s4ORovT3awWF1d8YXLg8tgz8SSbx51re9g8 5p0M9OjbsorRY/q8n0wenzfJBbBFcdmkpOZklqUW6dslcGVceNXKWHBVuGLL+jmsDYx3+bsY OTkkBEwkVv65yQRhi0lcuLeerYuRi0NIYCmjxObj29khnD4miWk//rKAVLEJGEtsXr4ErEpE 4CqjxMQli8GqmAWOMkrcmHUXbJawgI/EzWe3WEFsFgFViXNbHjKD2LwC7hJnJn9khNgnJ3Hy 2GSwGk4BD4nepVfZQWwhoJrmpafYJjDyLmBkWMUomlqaXFCclJ5rqFecmFtcmpeul5yfu4kR EnxfdjAuPmZ1iFGAg1GJh/dD/OUQIdbEsuLK3EOMEhzMSiK8DH+BQrwpiZVVqUX58UWlOanF hxiZODilGhhzDmosFIpiyDfV+GbMK5uwyLe4JbBhauj/Mu6Fm8QE2bZssVN0ZP+z/dcsm3BJ mQen3T7zaQcy3/ETPu6d8FvupNjty+d22P35IvLTreb15+UnTGe/+/lgYsfzuUyNJok8D2Z7 +F1vurjokPxa80+zNtb+15/1vXIH18RLb2xvzLqkfi3O+d1hJZbijERDLeai4kQA/Kx6HxwC AAA= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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); - } /* * 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; -- 1.9.1