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: 1786311 Return-Path: X-Original-To: patchwork-linux-sh@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id C54533FC23 for ; Thu, 22 Nov 2012 19:23:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932238Ab2KVTXc (ORCPT ); Thu, 22 Nov 2012 14:23:32 -0500 Received: from mail-pb0-f46.google.com ([209.85.160.46]:59210 "EHLO mail-pb0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753411Ab2KVTXa (ORCPT ); Thu, 22 Nov 2012 14:23:30 -0500 Received: by mail-pb0-f46.google.com with SMTP id wy7so6046279pbc.19 for ; Thu, 22 Nov 2012 11:23:30 -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=eqb2ji8UDpHW4SmujrZIeobtgra9h3xt8tN+XcWR7AOrpuRm5q1UmrGJsdCamuf+H+ /fSRVJjR7xTdYM9ChTf3gv+1tc6D8JetwiM3+YsrV1F+gNsRvwBplYPPsmBQCFDtSzMq J10TVQEZJP4gUJlQXiMJKqN2oUGSn1u0sqdnNt8tPsug3b81BauRQ7fEuXV8FpUxQqGU gRDyQJ3LmR5O9vKdvEo4u2QYCkbwrf8/zLYlU68U34nxEflRQH6vwjUVce8jg1A/2TYD Wwyp++tGoOHhd9HEVI+/pZN4o8UbkSj4nHlveGSDe9+EDKSTh1wjy0SFQtvf7qJ4PjkT MTyg== 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 Cc: magnus.damm@gmail.com, horms@verge.net.au, Nobuhiro Iwamatsu 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: ALoCoQkKcBIgvWyL2sSDqVA26absGg+n+PT3+0i/BwoBlChQBo0R0oH7N9yGREKynP8ErM0jVjYf Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.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 */