From patchwork Thu Oct 15 06:59:37 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Horman X-Patchwork-Id: 7402961 X-Patchwork-Delegate: horms@verge.net.au Return-Path: X-Original-To: patchwork-linux-sh@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 16E65BEEA4 for ; Thu, 15 Oct 2015 06:59:53 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4CD772089F for ; Thu, 15 Oct 2015 06:59:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5F5C820852 for ; Thu, 15 Oct 2015 06:59:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754032AbbJOG7t (ORCPT ); Thu, 15 Oct 2015 02:59:49 -0400 Received: from kirsty.vergenet.net ([202.4.237.240]:36826 "EHLO kirsty.vergenet.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754025AbbJOG7t (ORCPT ); Thu, 15 Oct 2015 02:59:49 -0400 Received: from reginn.isobedori.kobe.vergenet.net (p2250-ipbfp1101kobeminato.hyogo.ocn.ne.jp [122.22.210.250]) by kirsty.vergenet.net (Postfix) with ESMTPA id 9CA1F25B7EB; Thu, 15 Oct 2015 17:59:40 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=verge.net.au; s=mail; t=1444892380; bh=I2+lytgFBqE5mbcpwofaoHEHRwEuvO81i8xGIqM/eqw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Knpqyl1fpqedp7p1iBHUTXp2fIxJdNCXBJQK1CB7Kl0vNIO/ZpNRM65I6690Af/jd QUF69wO7xsBAhIJq2KrfOXK7Min69vR+FnS6hU4vciCDgwdc7no8q4r0rx57GDqdTQ xeDtFuUZhSQyPZxgBqLVAKpu951zg76uW5jO8hkA= Received: by reginn.isobedori.kobe.vergenet.net (Postfix, from userid 7100) id F129C94316B; Thu, 15 Oct 2015 15:59:38 +0900 (JST) From: Simon Horman To: Laurent Pinchart Cc: linux-sh@vger.kernel.org, Magnus Damm , Simon Horman Subject: [PATCH/RFC 6/6] arm: shmobile: rcar-gen2: Remove unused rcar_gen2_read_mode_pins() Date: Thu, 15 Oct 2015 15:59:37 +0900 Message-Id: <1444892377-10170-7-git-send-email-horms+renesas@verge.net.au> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1444892377-10170-1-git-send-email-horms+renesas@verge.net.au> References: <1444892377-10170-1-git-send-email-horms+renesas@verge.net.au> Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID,T_RP_MATCHES_RCVD,UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The new boot mode reg infrastructure is now used in place of rcar_gen2_read_mode_pins so the latter may now be removed. Signed-off-by: Simon Horman --- arch/arm/mach-shmobile/rcar-gen2.h | 1 - arch/arm/mach-shmobile/setup-rcar-gen2.c | 18 ------------------ 2 files changed, 19 deletions(-) diff --git a/arch/arm/mach-shmobile/rcar-gen2.h b/arch/arm/mach-shmobile/rcar-gen2.h index 8a66b4aae035..4c4ec37edc03 100644 --- a/arch/arm/mach-shmobile/rcar-gen2.h +++ b/arch/arm/mach-shmobile/rcar-gen2.h @@ -3,7 +3,6 @@ void rcar_gen2_timer_init(void); #define MD(nr) BIT(nr) -u32 rcar_gen2_read_mode_pins(void); void rcar_gen2_reserve(void); void rcar_gen2_pm_init(void); diff --git a/arch/arm/mach-shmobile/setup-rcar-gen2.c b/arch/arm/mach-shmobile/setup-rcar-gen2.c index 81a446bf1702..403ee0ede379 100644 --- a/arch/arm/mach-shmobile/setup-rcar-gen2.c +++ b/arch/arm/mach-shmobile/setup-rcar-gen2.c @@ -29,24 +29,6 @@ #include "common.h" #include "rcar-gen2.h" -#define MODEMR 0xe6160060 - -u32 rcar_gen2_read_mode_pins(void) -{ - static u32 mode; - static bool mode_valid; - - if (!mode_valid) { - void __iomem *modemr = ioremap_nocache(MODEMR, 4); - BUG_ON(!modemr); - mode = ioread32(modemr); - iounmap(modemr); - mode_valid = true; - } - - return mode; -} - #define CNTCR 0 #define CNTFID0 0x20