From patchwork Fri Jan 25 02:24:18 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Horman X-Patchwork-Id: 2039691 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 82D2ADF264 for ; Fri, 25 Jan 2013 02:55:54 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TyZP0-0002zN-66; Fri, 25 Jan 2013 02:52:27 +0000 Received: from kirsty.vergenet.net ([202.4.237.240]) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TyYz1-0006Cd-0Q for linux-arm-kernel@lists.infradead.org; Fri, 25 Jan 2013 02:25:55 +0000 Received: from ayumi.akashicho.tokyo.vergenet.net (p8120-ipbfp1001kobeminato.hyogo.ocn.ne.jp [118.10.137.120]) by kirsty.vergenet.net (Postfix) with ESMTP id 77CFC26717E; Fri, 25 Jan 2013 13:25:04 +1100 (EST) Received: by ayumi.akashicho.tokyo.vergenet.net (Postfix, from userid 7100) id 4792FEDEA07; Fri, 25 Jan 2013 11:25:02 +0900 (JST) From: Simon Horman To: Arnd Bergmann , Olof Johansson Subject: [PATCH 42/80] sh-pfc: Remove platform device registration Date: Fri, 25 Jan 2013 11:24:18 +0900 Message-Id: <1359080696-31489-43-git-send-email-horms+renesas@verge.net.au> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1359080696-31489-1-git-send-email-horms+renesas@verge.net.au> References: <1359080696-31489-1-git-send-email-horms+renesas@verge.net.au> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130124_212537_538807_5C64279C X-CRM114-Status: GOOD ( 12.67 ) X-Spam-Score: -3.3 (---) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-3.3 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [202.4.237.240 listed in list.dnswl.org] -0.7 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Laurent Pinchart , linux-sh@vger.kernel.org, Magnus Damm , arm@kernel.org, Simon Horman , linux-arm-kernel@lists.infradead.org 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 From: Laurent Pinchart The PFC platform device is now registered by arch code, remove the legacy registration mechanism. Signed-off-by: Laurent Pinchart Acked-by: Paul Mundt Acked-by: Linus Walleij Signed-off-by: Simon Horman --- drivers/sh/pfc/core.c | 12 ------------ include/linux/sh_pfc.h | 10 ---------- 2 files changed, 22 deletions(-) diff --git a/drivers/sh/pfc/core.c b/drivers/sh/pfc/core.c index b2e121d..9456c70 100644 --- a/drivers/sh/pfc/core.c +++ b/drivers/sh/pfc/core.c @@ -578,18 +578,6 @@ static struct platform_driver sh_pfc_driver = { }, }; -static struct platform_device sh_pfc_device = { - .name = DRV_NAME, - .id = -1, -}; - -int __init register_sh_pfc(struct sh_pfc_platform_data *pdata) -{ - sh_pfc_device.dev.platform_data = pdata; - - return platform_device_register(&sh_pfc_device); -} - static int __init sh_pfc_init(void) { return platform_driver_register(&sh_pfc_driver); diff --git a/include/linux/sh_pfc.h b/include/linux/sh_pfc.h index f7f01b2..fa1fec0 100644 --- a/include/linux/sh_pfc.h +++ b/include/linux/sh_pfc.h @@ -120,16 +120,6 @@ struct sh_pfc_platform_data { /* XXX compat for now */ #define pinmux_info sh_pfc_platform_data -/* drivers/sh/pfc/core.c */ -int register_sh_pfc(struct sh_pfc_platform_data *pfc); - -/* xxx */ -static inline int register_pinmux(struct pinmux_info *pip) -{ - struct sh_pfc_platform_data *pdata = pip; - return register_sh_pfc(pdata); -} - enum { GPIO_CFG_DRYRUN, GPIO_CFG_REQ, GPIO_CFG_FREE }; /* helper macro for port */