From patchwork Tue Sep 24 03:03:16 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Hao X-Patchwork-Id: 277342 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from ozlabs.org (localhost [IPv6:::1]) by ozlabs.org (Postfix) with ESMTP id 0CD312C023B for ; Tue, 24 Sep 2013 13:07:06 +1000 (EST) Received: from mail-pd0-x22d.google.com (mail-pd0-x22d.google.com [IPv6:2607:f8b0:400e:c02::22d]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority" (not verified)) by ozlabs.org (Postfix) with ESMTPS id 65B312C0129 for ; Tue, 24 Sep 2013 13:05:58 +1000 (EST) Received: by mail-pd0-f173.google.com with SMTP id p10so4010589pdj.32 for ; Mon, 23 Sep 2013 20:05:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=8BZL5OCdl7gAhlOMX6FyRulUm1jg0QOyiopocTma1XM=; b=JVqAZelFyPhL/61G6zFVqmf0Q6LEN2H21rpJwv7HUddRhaEl0biRHX2bEsl9qyO1e6 tzjdkEfkWBvv+D83HO8QJPjZIi3O4PRxYkcywn3oQZzd3+L5OT/f1+PFGSXo55hLLKN1 3yUBiph5fddhjNG62YG1YupZqkE17L/qS6sEza6yx97Q8UkcEGi8EMk+8jWDq+8wVKCX qJVjXu0WV4xqKw6DmzrhsoULFoAFohWmloLmhp45K7BPbzJG/aMEJe7Uf+BFxyW19s0e f9rXwCwjbU6M95E32YphXGi9bo6+1EYrbZoCAjbhenH2bC/flY8rrB+0GjhEyMiGavs/ kJjg== X-Received: by 10.66.170.168 with SMTP id an8mr27033509pac.58.1379991955976; Mon, 23 Sep 2013 20:05:55 -0700 (PDT) Received: from pek-khao-d1.corp.ad.wrs.com ([1.202.252.122]) by mx.google.com with ESMTPSA id ry4sm41839775pab.4.1969.12.31.16.00.00 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Mon, 23 Sep 2013 20:05:54 -0700 (PDT) From: Kevin Hao To: Scott Wood Subject: [PATCH v3 2/3] powerpc/85xx: rename the corenet_ds.c to corenet_generic.c Date: Tue, 24 Sep 2013 11:03:16 +0800 Message-Id: <1379991797-29222-3-git-send-email-haokexin@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1379991797-29222-1-git-send-email-haokexin@gmail.com> References: <1379991797-29222-1-git-send-email-haokexin@gmail.com> Cc: linuxppc X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.16rc2 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" This file is also used by some RDB and QDS boards. So the name seems not so accurate. Rename it to corenet_generic.c. Also update the function names in this file according to the change. Signed-off-by: Kevin Hao --- v3: No change. v2: A new patch in v2. arch/powerpc/platforms/85xx/Makefile | 2 +- .../platforms/85xx/{corenet_ds.c => corenet_generic.c} | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) rename arch/powerpc/platforms/85xx/{corenet_ds.c => corenet_generic.c} (93%) diff --git a/arch/powerpc/platforms/85xx/Makefile b/arch/powerpc/platforms/85xx/Makefile index a6c281d..dd4c0b5 100644 --- a/arch/powerpc/platforms/85xx/Makefile +++ b/arch/powerpc/platforms/85xx/Makefile @@ -18,7 +18,7 @@ obj-$(CONFIG_P1010_RDB) += p1010rdb.o obj-$(CONFIG_P1022_DS) += p1022_ds.o obj-$(CONFIG_P1022_RDK) += p1022_rdk.o obj-$(CONFIG_P1023_RDS) += p1023_rds.o -obj-$(CONFIG_CORENET_GENERIC) += corenet_ds.o +obj-$(CONFIG_CORENET_GENERIC) += corenet_generic.o obj-$(CONFIG_STX_GP3) += stx_gp3.o obj-$(CONFIG_TQM85xx) += tqm85xx.o obj-$(CONFIG_SBC8548) += sbc8548.o diff --git a/arch/powerpc/platforms/85xx/corenet_ds.c b/arch/powerpc/platforms/85xx/corenet_generic.c similarity index 93% rename from arch/powerpc/platforms/85xx/corenet_ds.c rename to arch/powerpc/platforms/85xx/corenet_generic.c index 8e0285a..fbd871e 100644 --- a/arch/powerpc/platforms/85xx/corenet_ds.c +++ b/arch/powerpc/platforms/85xx/corenet_generic.c @@ -32,7 +32,7 @@ #include #include "smp.h" -void __init corenet_ds_pic_init(void) +void __init corenet_gen_pic_init(void) { struct mpic *mpic; unsigned int flags = MPIC_BIG_ENDIAN | MPIC_SINGLE_DEST_CPU | @@ -50,7 +50,7 @@ void __init corenet_ds_pic_init(void) /* * Setup the architecture */ -void __init corenet_ds_setup_arch(void) +void __init corenet_gen_setup_arch(void) { mpc85xx_smp_init(); @@ -91,7 +91,7 @@ static const struct of_device_id of_device_ids[] = { {} }; -int __init corenet_ds_publish_devices(void) +int __init corenet_gen_publish_devices(void) { return of_platform_bus_probe(NULL, of_device_ids, NULL); } @@ -159,8 +159,8 @@ static int __init corenet_generic_probe(void) define_machine(corenet_generic) { .name = "CoreNet Generic", .probe = corenet_generic_probe, - .setup_arch = corenet_ds_setup_arch, - .init_IRQ = corenet_ds_pic_init, + .setup_arch = corenet_gen_setup_arch, + .init_IRQ = corenet_gen_pic_init, #ifdef CONFIG_PCI .pcibios_fixup_bus = fsl_pcibios_fixup_bus, #endif @@ -175,7 +175,7 @@ define_machine(corenet_generic) { #endif }; -machine_arch_initcall(corenet_generic, corenet_ds_publish_devices); +machine_arch_initcall(corenet_generic, corenet_gen_publish_devices); #ifdef CONFIG_SWIOTLB machine_arch_initcall(corenet_generic, swiotlb_setup_bus_notifier);