From patchwork Tue Sep 2 21:19:14 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Soren Brinkmann X-Patchwork-Id: 4828261 Return-Path: X-Original-To: patchwork-linux-pm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 5ACF29F32F for ; Tue, 2 Sep 2014 21:20:16 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 853E820131 for ; Tue, 2 Sep 2014 21:20:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C285F201DD for ; Tue, 2 Sep 2014 21:20:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754897AbaIBVTs (ORCPT ); Tue, 2 Sep 2014 17:19:48 -0400 Received: from mail-pd0-f176.google.com ([209.85.192.176]:49518 "EHLO mail-pd0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755173AbaIBVTp (ORCPT ); Tue, 2 Sep 2014 17:19:45 -0400 Received: by mail-pd0-f176.google.com with SMTP id w10so120012pde.21 for ; Tue, 02 Sep 2014 14:19:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=Qvxc77m8ej8X9lUQlqXTVCRxjeBPCbIhRythYA7xGeM=; b=ipH2UX4681duEOZS4bv1Wv1gFXHPdap7YZk0qdHHlKX+XHTGErSQ/Zp7wrpUzr5hBL wYkhD492tQIReA5hACTbzErfjgJpsk8Ss/rQlSDAbKiaei/t8DyVXybAn+g1fD6AYYBB 7iZDHoMMjeHnOcNFbQKBBDMCgbeFuG/WCsa+8m16Hb8KpkUAuWY7BeeuLOWnsSUiCrI+ ZohhmhYWIM1pXAvrQhxtyGsvpO01WsF5LvL5ofQ525LeZRJhXBCxwsuGCu4VaCLAFPl4 Ts4zxWRqEpQUiksYZhM+90Lg8uasJcuhi4tGLbtMGTltV9X6CiQICVnx2hTzbCnln/QO b38w== X-Received: by 10.68.136.164 with SMTP id qb4mr51448570pbb.39.1409692784866; Tue, 02 Sep 2014 14:19:44 -0700 (PDT) Received: from localhost ([149.199.62.254]) by mx.google.com with ESMTPSA id b4sm6830372pdh.21.2014.09.02.14.19.43 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Tue, 02 Sep 2014 14:19:44 -0700 (PDT) From: Soren Brinkmann To: Michal Simek , Daniel Lezcano Cc: Russell King , "Rafael J. Wysocki" , =?UTF-8?q?S=C3=B6ren=20Brinkmann?= , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, linux-pm@vger.kernel.org, Rob Herring , Mark Rutland , Pawel Moll , Ian Campbell , Kumar Gala Subject: [PATCH v2 9/9] ARM: zynq: Rename 'zynq_platform_cpu_die' Date: Tue, 2 Sep 2014 14:19:14 -0700 Message-Id: <1409692754-13437-10-git-send-email-soren.brinkmann@xilinx.com> X-Mailer: git-send-email 2.1.0.1.g27b9230 In-Reply-To: <1409692754-13437-1-git-send-email-soren.brinkmann@xilinx.com> References: <1409692754-13437-1-git-send-email-soren.brinkmann@xilinx.com> Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Spam-Status: No, score=-8.5 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham 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 Match the naming pattern of all other SMP ops and rename zynq_platform_cpu_die --> zynq_cpu_die. Signed-off-by: Soren Brinkmann --- v2: - make comments comply to kernel-doc format --- arch/arm/mach-zynq/platsmp.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/arch/arm/mach-zynq/platsmp.c b/arch/arm/mach-zynq/platsmp.c index f722b5a83a45..52d768ff7857 100644 --- a/arch/arm/mach-zynq/platsmp.c +++ b/arch/arm/mach-zynq/platsmp.c @@ -137,12 +137,14 @@ static int zynq_cpu_kill(unsigned cpu) return 1; } -/* - * platform-specific code to shutdown a CPU +/** + * zynq_cpu_die - Let a CPU core die + * @cpu: Dying CPU * - * Called with IRQs disabled + * Platform-specific code to shutdown a CPU. + * Called with IRQs disabled on the dying CPU. */ -static void zynq_platform_cpu_die(unsigned int cpu) +static void zynq_cpu_die(unsigned int cpu) { zynq_slcr_cpu_state_write(cpu, true); @@ -162,7 +164,7 @@ struct smp_operations zynq_smp_ops __initdata = { .smp_boot_secondary = zynq_boot_secondary, .smp_secondary_init = zynq_secondary_init, #ifdef CONFIG_HOTPLUG_CPU - .cpu_die = zynq_platform_cpu_die, + .cpu_die = zynq_cpu_die, .cpu_kill = zynq_cpu_kill, #endif };