From patchwork Fri Mar 29 08:55:37 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shawn Guo X-Patchwork-Id: 232317 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from mail-wg0-f64.google.com (mail-wg0-f64.google.com [74.125.82.64]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority" (not verified)) by ozlabs.org (Postfix) with ESMTPS id DE9882C00A0 for ; Fri, 29 Mar 2013 19:56:09 +1100 (EST) Received: by mail-wg0-f64.google.com with SMTP id e11sf92232wgh.29 for ; Fri, 29 Mar 2013 01:55:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20120806; h=x-received:x-beenthere:x-received:received-spf :x-forefront-antispam-report:x-spamscore:x-bigfish :x-fb-domain-ip-match:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references:mime-version:x-originatororg :x-original-sender:x-original-authentication-results:reply-to :precedence:mailing-list:list-id:x-google-group-id:list-post :list-help:list-archive:sender:list-subscribe:list-unsubscribe :content-type; bh=jkrC5QYCcfhCEL3H9G9sKVegD9jkbWnwuMLSfaDEfVU=; b=Ej5PuUlZ/VdghyBrHbG/RwBS1D8xpl+GX07R8Ok2ztgluCA3mRCh7JcPjq+6Hy70Xm vqhc8slGiWIj2aTpNvfTQQFCrhbm2GaZrtuI6lnnk2+IGs5MybkFNwnsMZQhsqHVSag2 lj/ZI5d2bnGfjV9Wbzml4Oe/zNLXykedELvd7EouSAJ5YjveasQm/nikYXMkq4roXx5R oWz+iMf7UoscdKikKTyHYAeasQq2b38bWD6HzHwThMJnza7tqRbYyq0jYWXkRfy7ahIZ JJ6RF57Oe9+BJ1onsSDpNX4sC4IHemE/LE2h2hX1hzP/vgoovIubfmU+GVw/pw623lMU rQsg== X-Received: by 10.180.37.48 with SMTP id v16mr111734wij.11.1364547356539; Fri, 29 Mar 2013 01:55:56 -0700 (PDT) X-BeenThere: rtc-linux@googlegroups.com Received: by 10.180.73.2 with SMTP id h2ls1091773wiv.20.canary; Fri, 29 Mar 2013 01:55:56 -0700 (PDT) X-Received: by 10.14.0.196 with SMTP id 44mr2853084eeb.4.1364547356285; Fri, 29 Mar 2013 01:55:56 -0700 (PDT) Received: from am1outboundpool.messaging.microsoft.com (am1ehsobe004.messaging.microsoft.com. [213.199.154.207]) by gmr-mx.google.com with ESMTPS id 6si479375eej.0.2013.03.29.01.55.55 (version=TLSv1 cipher=RC4-SHA bits=128/128); Fri, 29 Mar 2013 01:55:55 -0700 (PDT) Received-SPF: neutral (google.com: 213.199.154.207 is neither permitted nor denied by best guess record for domain of shawn.guo@linaro.org) client-ip=213.199.154.207; Received: from mail14-am1-R.bigfish.com (10.3.201.249) by AM1EHSOBE022.bigfish.com (10.3.207.144) with Microsoft SMTP Server id 14.1.225.23; Fri, 29 Mar 2013 08:55:55 +0000 Received: from mail14-am1 (localhost [127.0.0.1]) by mail14-am1-R.bigfish.com (Postfix) with ESMTP id 4F44730020F; Fri, 29 Mar 2013 08:55:55 +0000 (UTC) X-Forefront-Antispam-Report: CIP:70.37.183.190; KIP:(null); UIP:(null); IPV:NLI; H:mail.freescale.net; RD:none; EFVD:NLI X-SpamScore: 3 X-BigFish: VS3(zcb8kzzz1f42h1fc6h1ee6h1de0h1202h1e76h1d1ah1d2ahzz8275dh8275bhz2dh87h2a8h668h839hd24he5bhf0ah1288h12a5h12a9h12bdh12e5h137ah139eh13b6h1441h1504h1537h162dh1631h1758h1898h18e1h1946h19b5h1ad9h1b0ah1155h) X-FB-DOMAIN-IP-MATCH: fail Received: from mail14-am1 (localhost.localdomain [127.0.0.1]) by mail14-am1 (MessageSwitch) id 1364547353235631_31797; Fri, 29 Mar 2013 08:55:53 +0000 (UTC) Received: from AM1EHSMHS006.bigfish.com (unknown [10.3.201.236]) by mail14-am1.bigfish.com (Postfix) with ESMTP id 341CA2004F; Fri, 29 Mar 2013 08:55:53 +0000 (UTC) Received: from mail.freescale.net (70.37.183.190) by AM1EHSMHS006.bigfish.com (10.3.207.106) with Microsoft SMTP Server (TLS) id 14.1.225.23; Fri, 29 Mar 2013 08:55:53 +0000 Received: from tx30smr01.am.freescale.net (10.81.153.31) by 039-SN1MMR1-002.039d.mgd.msft.net (10.84.1.15) with Microsoft SMTP Server (TLS) id 14.2.328.11; Fri, 29 Mar 2013 08:55:51 +0000 Received: from S2101-09.ap.freescale.net ([10.192.185.52]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id r2T8tgg3005201; Fri, 29 Mar 2013 01:55:49 -0700 From: Shawn Guo To: CC: Shawn Guo , Andrew Morton , Subject: [rtc-linux] [PATCH 01/13] rtc: stmp3xxx: use stmp_reset_block() instead Date: Fri, 29 Mar 2013 16:55:37 +0800 Message-ID: <1364547350-30498-2-git-send-email-shawn.guo@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1364547350-30498-1-git-send-email-shawn.guo@linaro.org> References: <1364547350-30498-1-git-send-email-shawn.guo@linaro.org> MIME-Version: 1.0 X-OriginatorOrg: sigmatel.com X-Original-Sender: shawn.guo@linaro.org X-Original-Authentication-Results: gmr-mx.google.com; spf=neutral (google.com: 213.199.154.207 is neither permitted nor denied by best guess record for domain of shawn.guo@linaro.org) smtp.mail=shawn.guo@linaro.org 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: Sender: rtc-linux@googlegroups.com List-Subscribe: , List-Unsubscribe: , The function stmp_reset_block() provides the exactly same functionality as mxs_reset_block(). So use stmp_reset_block() instead, so that inclusion can be removed. Signed-off-by: Shawn Guo Cc: Andrew Morton Cc: rtc-linux@googlegroups.com --- drivers/rtc/rtc-stmp3xxx.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/rtc/rtc-stmp3xxx.c b/drivers/rtc/rtc-stmp3xxx.c index 98f0d3c..67d2612 100644 --- a/drivers/rtc/rtc-stmp3xxx.c +++ b/drivers/rtc/rtc-stmp3xxx.c @@ -30,8 +30,6 @@ #include #include -#include - #define STMP3XXX_RTC_CTRL 0x0 #define STMP3XXX_RTC_CTRL_SET 0x4 #define STMP3XXX_RTC_CTRL_CLR 0x8 @@ -271,7 +269,7 @@ static int stmp3xxx_rtc_probe(struct platform_device *pdev) platform_set_drvdata(pdev, rtc_data); - mxs_reset_block(rtc_data->io); + stmp_reset_block(rtc_data->io); writel(STMP3XXX_RTC_PERSISTENT0_ALARM_EN | STMP3XXX_RTC_PERSISTENT0_ALARM_WAKE_EN | STMP3XXX_RTC_PERSISTENT0_ALARM_WAKE, @@ -319,7 +317,7 @@ static int stmp3xxx_rtc_resume(struct platform_device *dev) { struct stmp3xxx_rtc_data *rtc_data = platform_get_drvdata(dev); - mxs_reset_block(rtc_data->io); + stmp_reset_block(rtc_data->io); writel(STMP3XXX_RTC_PERSISTENT0_ALARM_EN | STMP3XXX_RTC_PERSISTENT0_ALARM_WAKE_EN | STMP3XXX_RTC_PERSISTENT0_ALARM_WAKE,