From patchwork Thu Nov 22 08:23:38 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nobuhiro Iwamatsu X-Patchwork-Id: 1783141 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork2.kernel.org (Postfix) with ESMTP id 49CCDDF24C for ; Thu, 22 Nov 2012 08:26:21 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TbS4h-0003D4-2c; Thu, 22 Nov 2012 08:23:55 +0000 Received: from mail-da0-f49.google.com ([209.85.210.49]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1TbS4a-0003BD-Io for linux-arm-kernel@lists.infradead.org; Thu, 22 Nov 2012 08:23:51 +0000 Received: by mail-da0-f49.google.com with SMTP id v40so2334750dad.36 for ; Thu, 22 Nov 2012 00:23:47 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer :x-gm-message-state; bh=Uy4qzfm4dQflVSf14iZ8qwT3e4PJ4mWKuZmWeAAxWfM=; b=VwvUlgltvXFh3TqOm8GbUXsfXLybTSRS6GXuekijmzo13WVlxWamCN9Aos3fzt1wb9 FO+SLllxBjIOsvEYdkgPbQgB5hUbHHDWW/8qW4UJhU5ENviQZbSVWNUlKAza+3kbtsJ9 LqGuDFSRsQ+p5pz5YibWuM/SEohM00TL/TY+08gGzQHV/ea/UlRqK7wpa9qdJYv6jt9c hA9nf84nNhyfVCB5itOuHst1wAJSgrBhEAh9my3uDLVJz1pCgstGJtr2tE4YwsMHDuRO JyXNHQAwpaeQiIR9zso7V6qR+8/2VvLmrOB8viVzAB5opoFexGHvdOLPb1t89cHo4WX1 PTvA== Received: by 10.68.189.233 with SMTP id gl9mr2421764pbc.166.1353572627095; Thu, 22 Nov 2012 00:23:47 -0800 (PST) Received: from xps-iwamatsu.renesas.com (49.14.32.202.bf.2iij.net. [202.32.14.49]) by mx.google.com with ESMTPS id qt3sm1695685pbb.32.2012.11.22.00.23.45 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 22 Nov 2012 00:23:46 -0800 (PST) From: Nobuhiro Iwamatsu To: linux-sh@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH shmobile/DT 1/2] ARM: shmobile: Remove some of_sh_intc_* functions Date: Thu, 22 Nov 2012 17:23:38 +0900 Message-Id: <1353572619-29098-1-git-send-email-nobuhiro.iwamatsu.yj@renesas.com> X-Mailer: git-send-email 1.7.10.4 X-Gm-Message-State: ALoCoQnNLjdXjXnAVktpijjZe/RpAdvGAb3/JvxrQKaAiiBKtXW+CRUBttLMaYga7Ls++GEasct7 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20121122_032349_001309_826BFBC3 X-CRM114-Status: GOOD ( 11.52 ) X-Spam-Score: -2.6 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.210.49 listed in list.dnswl.org] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Nobuhiro Iwamatsu , horms@verge.net.au, magnus.damm@gmail.com X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org This removes of_sh_intc_get_meminfo, of_sh_intc_get_pint and of_sh_intc_get_intc functions. These are not already used. Signed-off-by: Nobuhiro Iwamatsu --- drivers/sh/intc/of_intc.c | 76 --------------------------------------------- include/linux/sh_intc.h | 28 ----------------- 2 files changed, 104 deletions(-) diff --git a/drivers/sh/intc/of_intc.c b/drivers/sh/intc/of_intc.c index 30b1090..e833e48 100644 --- a/drivers/sh/intc/of_intc.c +++ b/drivers/sh/intc/of_intc.c @@ -529,49 +529,6 @@ void __init of_sh_intc_get_skip_syscore_suspend(struct device_node *np, d->skip_syscore_suspend = false; } -int __init of_sh_intc_get_meminfo(struct device_node *np, - struct resource *res, int res_no) -{ - int ret = 0, i; - - for (i = 0 ; i < res_no ; i++) { - ret = of_address_to_resource(np, i, &res[i]); - if (ret) { - pr_err("could not determine device base address\n"); - return ret; - } - - pr_debug("%s: Address 0x%x, size %d\n", - __func__, res[i].start, resource_size(&res[i])); - } - - return ret; -} - -int __init of_sh_intc_get_pint(struct device_node *np, struct intc_desc *d) -{ - /* pint uses vector, mask and sence. */ - int ret = of_sh_intc_get_vector(np, &d->hw.vectors, - &d->hw.nr_vectors); - if (ret) - return ret; - - ret = of_sh_intc_get_mask(np, &d->hw.mask_regs, - &d->hw.nr_mask_regs); - if (ret) - return ret; - - ret = of_sh_intc_get_sense(np, &d->hw.sense_regs, - &d->hw.nr_sense_regs); - /* INTC may not need Sence register. */ - if (ret && ret != -ENOENT) - return ret; - - d->of_node = np; - - return 0; -} - int __init of_sh_intc_get_intc(struct device_node *np, struct intc_desc *d) { int ret = of_sh_intc_get_vector(np, &d->hw.vectors, @@ -611,36 +568,3 @@ int __init of_sh_intc_get_intc(struct device_node *np, struct intc_desc *d) return 0; } - -int __init of_sh_intc_get_intc_pins(struct device_node *np, - struct intc_desc *d) -{ - int ret = of_sh_intc_get_vector(np, &d->hw.vectors, - &d->hw.nr_vectors); - if (ret) - return ret; - - ret = of_sh_intc_get_mask(np, &d->hw.mask_regs, - &d->hw.nr_mask_regs); - if (ret) - return ret; - - ret = of_sh_intc_get_prio(np, &d->hw.prio_regs, - &d->hw.nr_prio_regs); - if (ret) - return ret; - - ret = of_sh_intc_get_sense(np, &d->hw.sense_regs, - &d->hw.nr_sense_regs); - if (ret) - return ret; - - ret = of_sh_intc_get_ack(np, &d->hw.ack_regs, - &d->hw.nr_ack_regs); - if (ret) - return ret; - - d->of_node = np; - - return 0; -} diff --git a/include/linux/sh_intc.h b/include/linux/sh_intc.h index 6603da6..c7954ee 100644 --- a/include/linux/sh_intc.h +++ b/include/linux/sh_intc.h @@ -161,26 +161,6 @@ static inline int register_intc_userimask(unsigned long addr) int of_sh_intc_get_intc(struct device_node *np, struct intc_desc *d); /* - * of_sh_initc_get_intc_pins() - Get INTC Pins table. - * @np: device node to get INTC from - * @d: a pointer of intc pins table - * - * Return: one of the errno value on the error condition - */ -int of_sh_intc_get_intc_pins(struct device_node *np, struct intc_desc *d); - -/* - * of_sh_intc_get_meminfo() - Get and set INTC register of memory. - * @np: device node to get INTC from - * @res_mem: a pointer of resource - * @res_no: resource number - * - * Return: one of the errno value on the error condition - */ -int of_sh_intc_get_meminfo(struct device_node *np, - struct resource *res_mem, int resno); - -/* * of_sh_intc_get_force_enable - Get and set force_enable vector in * struct intc_desc. * @np: device node to get INTC from @@ -221,13 +201,5 @@ void of_sh_intc_get_skip_syscore_suspend(struct device_node *np, * Return: one of the errno value on the error condition */ int of_sh_intc_get_intevtsa_vect(struct device_node *np, unsigned short *vect); -/* - * of_sh_initc_get_intc_pint() - Get INTC Pint table. - * @np: device node to get INTC from - * @d: a pointer of intc pint table - * - * Return: one of the errno value on the error condition - */ -int of_sh_intc_get_pint(struct device_node *np, struct intc_desc *d); #endif /* __SH_INTC_H */