From patchwork Fri Feb 6 11:24:48 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 437146 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from mail-qa0-x237.google.com (mail-qa0-x237.google.com [IPv6:2607:f8b0:400d:c00::237]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id A7492140273 for ; Fri, 6 Feb 2015 22:25:18 +1100 (AEDT) Received: by mail-qa0-f55.google.com with SMTP id f12sf2797414qad.0 for ; Fri, 06 Feb 2015 03:25:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20120806; h=mime-version:from:to:cc:subject:date:message-id:in-reply-to :references:x-original-sender:x-original-authentication-results :reply-to:content-type:precedence:mailing-list:list-id:list-post :list-help:list-archive:sender:list-subscribe:list-unsubscribe; bh=gp8FgrJlWSrhgG2qmoKnR0UzAf/xBVF9wQQFapSSKKc=; b=xb+sJbjrhYqoQf24PRwx4ffB1ATwzQ234FGh4utCUqLmM/tw37zGQBNl1dpaIx4I4m aloXvuuKdrWJquBiJgu2fGNW4QgrojdwjS2LOMHlHGZ7hSaBVAoKjdSmf1k7XVZQ2BEH fZ1Mi60/PoS+brhaXazhX1TRbWkTQGXsgwfqzxJg3c/1Gk2At+qqHaFtqidR/EEDGFIM hPnMVSZjWqhTsi0N+77U4Cd6kg/hWBDp5e37ilYm/wqgYolEiB5i/dF1oJqHrp4dle1t 2tNa36a0ptE22cU4fo09GV8AV5ln/E43weTF2Opj60BsmV3qPZHqTvI5rRkHLmYFZt1U pOew== X-Received: by 10.50.85.9 with SMTP id d9mr13258igz.1.1423221916934; Fri, 06 Feb 2015 03:25:16 -0800 (PST) MIME-Version: 1.0 X-BeenThere: rtc-linux@googlegroups.com Received: by 10.107.30.131 with SMTP id e125ls745803ioe.43.gmail; Fri, 06 Feb 2015 03:25:16 -0800 (PST) X-Received: by 10.70.126.138 with SMTP id my10mr2659344pdb.1.1423221916742; Fri, 06 Feb 2015 03:25:16 -0800 (PST) Received: from mailout2.w1.samsung.com (mailout2.w1.samsung.com. [210.118.77.12]) by gmr-mx.google.com with ESMTPS id re6si882683pab.1.2015.02.06.03.25.16 for (version=TLSv1 cipher=RC4-MD5 bits=128/128); Fri, 06 Feb 2015 03:25:16 -0800 (PST) Received-SPF: none (google.com: k.kozlowski@samsung.com does not designate permitted sender hosts) client-ip=210.118.77.12; Received: from eucpsbgm1.samsung.com (unknown [203.254.199.244]) by mailout2.w1.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0NJC00AEHL8P1X00@mailout2.w1.samsung.com> for rtc-linux@googlegroups.com; Fri, 06 Feb 2015 11:29:13 +0000 (GMT) X-AuditID: cbfec7f4-b7f126d000001e9a-53-54d4a405bd06 Received: from eusync2.samsung.com ( [203.254.199.212]) by eucpsbgm1.samsung.com (EUCPMTA) with SMTP id A1.54.07834.504A4D45; Fri, 06 Feb 2015 11:22:45 +0000 (GMT) Received: from AMDC1943.digital.local ([106.116.151.171]) by eusync2.samsung.com (Oracle Communications Messaging Server 7u4-23.01(7.0.4.23.0) 64bit (built Aug 10 2011)) with ESMTPA id <0NJC00D4ML1UDMA0@eusync2.samsung.com>; Fri, 06 Feb 2015 11:25:10 +0000 (GMT) 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: [rtc-linux] [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= X-Original-Sender: k.kozlowski@samsung.com X-Original-Authentication-Results: gmr-mx.google.com; spf=none (google.com: k.kozlowski@samsung.com does not designate permitted sender hosts) smtp.mail=k.kozlowski@samsung.com Reply-To: rtc-linux@googlegroups.com Precedence: list Mailing-list: list rtc-linux@googlegroups.com; contact rtc-linux+owners@googlegroups.com List-ID: X-Google-Group-Id: 712029733259 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , 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 Acked-by: Lee Jones --- 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;