From patchwork Mon Sep 1 18:09:13 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tero Kristo X-Patchwork-Id: 36416 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-yk0-f198.google.com (mail-yk0-f198.google.com [209.85.160.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id CC3FC2032B for ; Mon, 1 Sep 2014 18:10:33 +0000 (UTC) Received: by mail-yk0-f198.google.com with SMTP id q200sf19994329ykb.9 for ; Mon, 01 Sep 2014 11:10:33 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe:content-type; bh=eZ8dkabjnTIiLouUXs+fEsLHmnQCNWj5oMF+w7Ab2hE=; b=UChM07V4LJribOrswb6Nfgd6oB2D50xzFYGi2jZrUzvK6UtnDBSSEeMR/kW1vlB6PS kR8glp0zXL7R0623beuHOR2LfttRO59QjpV63jT/XlUNEW0STkHuH3MjyOmdkdsBIrXC QAIzy0YmVYB4g5V1CWSNhu+YVUMLAZ87BUPfyh9/j71IjHX0tB8/YZw9MXj37UWlq1dA cCjxMsGo4xsaR9+cKJBRuO31E8McKoDmyAmvoCxbqXJnbM6rBs9WG9KFnNVoLfYAsp4f KlMzbtU0xyhWYJZkeCS1hnEhp+of5FQF1NaCuXlFWS21FNAbSLa9duhPeOuDa2h1ye34 Ll9g== X-Gm-Message-State: ALoCoQloQRAc4ODoYLVuuX6PYKGNRi1x9xV6rlKD1Wc30llw880DxwysEjUCKH/fpKmODwRTpEZW X-Received: by 10.224.21.129 with SMTP id j1mr16393085qab.7.1409595033663; Mon, 01 Sep 2014 11:10:33 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.23.201 with SMTP id 67ls2134978qgp.45.gmail; Mon, 01 Sep 2014 11:10:33 -0700 (PDT) X-Received: by 10.52.228.67 with SMTP id sg3mr22413619vdc.6.1409595033554; Mon, 01 Sep 2014 11:10:33 -0700 (PDT) Received: from mail-vc0-f181.google.com (mail-vc0-f181.google.com [209.85.220.181]) by mx.google.com with ESMTPS id s6si1089057vdx.72.2014.09.01.11.10.33 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 01 Sep 2014 11:10:33 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.181 as permitted sender) client-ip=209.85.220.181; Received: by mail-vc0-f181.google.com with SMTP id ij19so5822725vcb.40 for ; Mon, 01 Sep 2014 11:10:33 -0700 (PDT) X-Received: by 10.221.6.201 with SMTP id ol9mr26553289vcb.2.1409595033481; Mon, 01 Sep 2014 11:10:33 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.221.45.67 with SMTP id uj3csp421382vcb; Mon, 1 Sep 2014 11:10:33 -0700 (PDT) X-Received: by 10.70.128.105 with SMTP id nn9mr42049434pdb.23.1409595032236; Mon, 01 Sep 2014 11:10:32 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id ef7si2466605pac.71.2014.09.01.11.10.31 for ; Mon, 01 Sep 2014 11:10:32 -0700 (PDT) Received-SPF: none (google.com: linux-omap-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754730AbaIASKa (ORCPT + 5 others); Mon, 1 Sep 2014 14:10:30 -0400 Received: from arroyo.ext.ti.com ([192.94.94.40]:35732 "EHLO arroyo.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754691AbaIASK0 (ORCPT ); Mon, 1 Sep 2014 14:10:26 -0400 Received: from dlelxv90.itg.ti.com ([172.17.2.17]) by arroyo.ext.ti.com (8.13.7/8.13.7) with ESMTP id s81IA4Pp026188; Mon, 1 Sep 2014 13:10:04 -0500 Received: from DFLE72.ent.ti.com (dfle72.ent.ti.com [128.247.5.109]) by dlelxv90.itg.ti.com (8.14.3/8.13.8) with ESMTP id s81IA43q010153; Mon, 1 Sep 2014 13:10:04 -0500 Received: from dlep33.itg.ti.com (157.170.170.75) by DFLE72.ent.ti.com (128.247.5.109) with Microsoft SMTP Server id 14.3.174.1; Mon, 1 Sep 2014 13:10:04 -0500 Received: from sokoban.home (ileax41-snat.itg.ti.com [10.172.224.153]) by dlep33.itg.ti.com (8.14.3/8.13.8) with ESMTP id s81I9JlN012145; Mon, 1 Sep 2014 13:10:03 -0500 From: Tero Kristo To: , , CC: Subject: [PATCH 24/26] ARM: OMAP4: PRM: make PRCM interrupt handler related functions static Date: Mon, 1 Sep 2014 21:09:13 +0300 Message-ID: <1409594955-1476-25-git-send-email-t-kristo@ti.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1409594955-1476-1-git-send-email-t-kristo@ti.com> References: <1409594955-1476-1-git-send-email-t-kristo@ti.com> MIME-Version: 1.0 Sender: linux-omap-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: t-kristo@ti.com X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.181 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , These are not needed outside the PRM driver, so make them static and remove the prototypes from the public header. Signed-off-by: Tero Kristo --- arch/arm/mach-omap2/prm44xx.c | 13 +++++++++---- arch/arm/mach-omap2/prm44xx_54xx.h | 6 ------ 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/arch/arm/mach-omap2/prm44xx.c b/arch/arm/mach-omap2/prm44xx.c index 15b4646..bfcc356 100644 --- a/arch/arm/mach-omap2/prm44xx.c +++ b/arch/arm/mach-omap2/prm44xx.c @@ -32,6 +32,11 @@ /* Static data */ +static void omap44xx_prm_read_pending_irqs(unsigned long *events); +static void omap44xx_prm_ocp_barrier(void); +static void omap44xx_prm_save_and_clear_irqen(u32 *saved_mask); +static void omap44xx_prm_restore_irqen(u32 *saved_mask); + static const struct omap_prcm_irq omap4_prcm_irqs[] = { OMAP_PRCM_IRQ("io", 9, 1), }; @@ -207,7 +212,7 @@ static inline u32 _read_pending_irq_reg(u16 irqen_offs, u16 irqst_offs) * MPU IRQs, and store the result into the two u32s pointed to by @events. * No return value. */ -void omap44xx_prm_read_pending_irqs(unsigned long *events) +static void omap44xx_prm_read_pending_irqs(unsigned long *events) { events[0] = _read_pending_irq_reg(OMAP4_PRM_IRQENABLE_MPU_OFFSET, OMAP4_PRM_IRQSTATUS_MPU_OFFSET); @@ -224,7 +229,7 @@ void omap44xx_prm_read_pending_irqs(unsigned long *events) * block, to avoid race conditions after acknowledging or clearing IRQ * bits. No return value. */ -void omap44xx_prm_ocp_barrier(void) +static void omap44xx_prm_ocp_barrier(void) { omap4_prm_read_inst_reg(OMAP4430_PRM_OCP_SOCKET_INST, OMAP4_REVISION_PRM_OFFSET); @@ -241,7 +246,7 @@ void omap44xx_prm_ocp_barrier(void) * interrupts reaches the PRM before returning; otherwise, spurious * interrupts might occur. No return value. */ -void omap44xx_prm_save_and_clear_irqen(u32 *saved_mask) +static void omap44xx_prm_save_and_clear_irqen(u32 *saved_mask) { saved_mask[0] = omap4_prm_read_inst_reg(OMAP4430_PRM_OCP_SOCKET_INST, @@ -270,7 +275,7 @@ void omap44xx_prm_save_and_clear_irqen(u32 *saved_mask) * No OCP barrier should be needed here; any pending PRM interrupts will fire * once the writes reach the PRM. No return value. */ -void omap44xx_prm_restore_irqen(u32 *saved_mask) +static void omap44xx_prm_restore_irqen(u32 *saved_mask) { omap4_prm_write_inst_reg(saved_mask[0], OMAP4430_PRM_OCP_SOCKET_INST, OMAP4_PRM_IRQENABLE_MPU_OFFSET); diff --git a/arch/arm/mach-omap2/prm44xx_54xx.h b/arch/arm/mach-omap2/prm44xx_54xx.h index 96477e7..faa7411 100644 --- a/arch/arm/mach-omap2/prm44xx_54xx.h +++ b/arch/arm/mach-omap2/prm44xx_54xx.h @@ -47,12 +47,6 @@ static inline void omap44xx_prm_reconfigure_io_chain(void) } #endif -/* PRM interrupt-related functions */ -extern void omap44xx_prm_read_pending_irqs(unsigned long *events); -extern void omap44xx_prm_ocp_barrier(void); -extern void omap44xx_prm_save_and_clear_irqen(u32 *saved_mask); -extern void omap44xx_prm_restore_irqen(u32 *saved_mask); - extern int __init omap44xx_prm_init(void); extern u32 omap44xx_prm_get_reset_sources(void);