From patchwork Mon May 27 01:42:58 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 2617121 Return-Path: X-Original-To: patchwork-linux-sh@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id BBDB3DFB79 for ; Mon, 27 May 2013 01:43:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755694Ab3E0BnA (ORCPT ); Sun, 26 May 2013 21:43:00 -0400 Received: from mail-pa0-f51.google.com ([209.85.220.51]:54858 "EHLO mail-pa0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755697Ab3E0BnA (ORCPT ); Sun, 26 May 2013 21:43:00 -0400 Received: by mail-pa0-f51.google.com with SMTP id lf10so5234117pab.24 for ; Sun, 26 May 2013 18:42:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=date:sender:message-id:to:cc:in-reply-to:references:from:subject :mime-version:content-type; bh=1QI+EXj2pn+EnrIINLGY44Jcm0mk1yoZQw9MIGap4sU=; b=bLyuJIuJSSfcic+z1yzvhS/aDjwS5TG19W2kYsccts41CCnBj01NJIjoD/+6DzfSx9 uL6JsfEP4bqBTQCT6bS8cuuL3Okkba0/upmymz0Z+PW4y154nNIthYDXnhHIHNpl9dk2 EulcZz0Xic35dZjO/Bgx7MK09Xhf9BDMQxftVhLxCUGkPd1Jl4ucUj0OU/95j1I+v6td BrIO0hgRtbZA2j2J6zAtLrrnnOzdZxaRbHAKh6aVQ6r1ualpgO6QxTVhB0PBJz67k1tN cJXzP5ma97Wzi/FMN4aoiU/gVBlK63Nroj/dMK4Mj1DV4xLxyYikjzGgIPN8oknQyue7 QotA== X-Received: by 10.66.219.202 with SMTP id pq10mr27459896pac.29.1369618979503; Sun, 26 May 2013 18:42:59 -0700 (PDT) Received: from morimoto-Dell-XPS420.gmail.com (49.14.32.202.bf.2iij.net. [202.32.14.49]) by mx.google.com with ESMTPSA id ov2sm26303996pbc.34.2013.05.26.18.42.56 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Sun, 26 May 2013 18:42:58 -0700 (PDT) Date: Sun, 26 May 2013 18:42:58 -0700 (PDT) Message-ID: <87ehct8ag0.wl%kuninori.morimoto.gx@renesas.com> To: Simon Cc: Magnus , Linux-SH , Kuninori Morimoto In-Reply-To: <87hahp8ald.wl%kuninori.morimoto.gx@renesas.com> References: <87li7fwgk8.wl%kuninori.morimoto.gx@renesas.com> <87hahp8ald.wl%kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 2/2 v3] ARM: shmobile: r8a7778: rename device additional function for sdhi MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org Current r8a7778 is using r8a7778_sdhi_init(). Now, we use r8a7778_register_xxx() instead of it Signed-off-by: Kuninori Morimoto --- v2 -> v3 - no change, but become 2nd patch >> Simon This patch exchange both board/setup. Please let me know if you need separated patch arch/arm/mach-shmobile/board-bockw.c | 2 +- arch/arm/mach-shmobile/include/mach/r8a7778.h | 2 +- arch/arm/mach-shmobile/setup-r8a7778.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm/mach-shmobile/board-bockw.c b/arch/arm/mach-shmobile/board-bockw.c index 3958910..e70112c 100644 --- a/arch/arm/mach-shmobile/board-bockw.c +++ b/arch/arm/mach-shmobile/board-bockw.c @@ -131,7 +131,7 @@ static void __init bockw_init(void) iowrite32(ioread32(base + PUPR4) | (3 << 26), base + PUPR4); iounmap(base); - r8a7778_sdhi_init(0, &sdhi0_info); + r8a7778_register_sdhi(0, &sdhi0_info); } } diff --git a/arch/arm/mach-shmobile/include/mach/r8a7778.h b/arch/arm/mach-shmobile/include/mach/r8a7778.h index 695cd76..c24e7eb 100644 --- a/arch/arm/mach-shmobile/include/mach/r8a7778.h +++ b/arch/arm/mach-shmobile/include/mach/r8a7778.h @@ -30,8 +30,8 @@ extern void r8a7778_init_irq_dt(void); extern void r8a7778_clock_init(void); extern void r8a7778_init_irq_extpin(int irlm); extern void r8a7778_pinmux_init(void); -extern void r8a7778_sdhi_init(int id, struct sh_mobile_sdhi_info *info); extern void r8a7778_register_sheth(struct sh_eth_plat_data *pdata); +extern void r8a7778_register_sdhi(int id, struct sh_mobile_sdhi_info *info); #endif /* __ASM_R8A7778_H__ */ diff --git a/arch/arm/mach-shmobile/setup-r8a7778.c b/arch/arm/mach-shmobile/setup-r8a7778.c index 9bff1e1..e44daac 100644 --- a/arch/arm/mach-shmobile/setup-r8a7778.c +++ b/arch/arm/mach-shmobile/setup-r8a7778.c @@ -162,8 +162,8 @@ static struct resource sdhi_resources[] __initdata = { DEFINE_RES_IRQ(gic_iid(0x76)), }; -void __init r8a7778_sdhi_init(int id, - struct sh_mobile_sdhi_info *info) +void __init r8a7778_register_sdhi(int id, + struct sh_mobile_sdhi_info *info) { BUG_ON(id < 0 || id > 2);