From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.7 required=3.0 tests=DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 471A4C10F14 for ; Tue, 15 Oct 2019 14:53:05 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 1100A20640 for ; Tue, 15 Oct 2019 14:53:05 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="rIMJ+9Iv"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="bwzp0QAN" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1100A20640 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=fAPBfL+M/ynb4Ibc3f90du+JikdLf51aXrYHFHQ1s4I=; b=rIMJ+9IvXUCBx+ BVMXHZdSexpxRxaFVhT1SqzQ7uPEq6H8fR2mhDbmIN2g9rejDDggp+KSpIvNcsV9qFkVo63EgsTDV Ow8ZSVVj3ADSRD6ZLNAHZnTBqfOZ2zQ+1SZvNl6WR1AO3GtHyw/eb0NoPqJU5y6FKP6x0KNO5LYFp cbpm9tXEp1eHB57MXo4RsO5EBqlNGp+iy9zQj2oOn1YTrGeoh7Xf8Tank/7OPRxq+sQpVXefTxWq1 O2hLCrMIH8E1yI/AFifr71/KVBqIycjPzV/GSw6uXvQ2c8dNksDaWXSsyXI3FKeq+3WcUQpr/4XBh F4BsGNphcWHx2scxBmMg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1iKOC0-00030g-0b; Tue, 15 Oct 2019 14:52:56 +0000 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1iKOBB-0002Gf-ID for linux-arm-kernel@lists.infradead.org; Tue, 15 Oct 2019 14:52:07 +0000 Received: by mail-wr1-x441.google.com with SMTP id y18so14797892wrn.5 for ; Tue, 15 Oct 2019 07:52:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=VAVoEu24xaohbwzafdzyJGlubUQKQUGPXTLnsYm65Y8=; b=bwzp0QANI9ZAtq8ebhpNJc/C77CZR6FTzH+/cfmEERClacgLvpuSHHtyidwDPuvey7 2+srWChtSJ08u/VocrpNHSezMmgEXrfg73hmVJ5V6I/IX8cmSHM9mweDVIYm3IFNz0Dm AXDFxGntAmh8J/NR1hmE1LCeCRUbmf+sdpB01ElSB8Jq5+afFFPUYW1h/xor3y9tPXst nSBA5TwwZP8lGioiDP7Ika8JxvuIsNcGTVQb5E6x7U7uP4c1vFKfl2Xh1Xf95g/yEsDs 72MZ32zM32bT+1Th+LMSK/H6r6ntFyZHVKe+GNZZsPnQrIU0czOC4kLlz5uGvZqufrcD 6/+Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=VAVoEu24xaohbwzafdzyJGlubUQKQUGPXTLnsYm65Y8=; b=PUG1tv2S4hmOS1KknJ8DNIarUAH0de5eFZkwSP5Go//7//xXuyBtYzIWHULID9ubnq iowtS2cbP8A4FQD5ZyPIHQ95ZPD0Azu6vaKQQwlLifg1dp0gZXSXmDuaOLhxYjUQOPCF P6+WE0LosJBZU5XsD5GFWPpQB0lv/D/Zi2n3pBxGZSfa9rtLlRGASkzCBXjjLXNGaFnE svI24ou59Gbd+ba+4q5pDOHSh+8N5Yq91G3XJxf8ui1iwzR5FoDwqrVgejqNBoiwiCRi IMyAm6giOJ6MbLFtr9kJXOkoLQBzIrR91zpuJSOHCz4I6FeRgf6NT8lml2E+WSNlzQX3 mFHA== X-Gm-Message-State: APjAAAUdwFEbCw9t1C5u4o+mG8+9+RpYCEVg+KlCidrrPnI2I/fQJQIK GJyUy3RdKu5L29qCQBpzveCgvnqH X-Google-Smtp-Source: APXvYqxhVxHqqgJpZEbxh6+QhqKe7xvgm6z1kpI/OiC4NTY0obJUmvAeKLRYIWZ9KloWkVuO1upBRw== X-Received: by 2002:adf:ea07:: with SMTP id q7mr14227941wrm.102.1571151123439; Tue, 15 Oct 2019 07:52:03 -0700 (PDT) Received: from localhost (p2E5BE2CE.dip0.t-ipconnect.de. [46.91.226.206]) by smtp.gmail.com with ESMTPSA id u11sm20954003wmd.32.2019.10.15.07.52.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Oct 2019 07:52:02 -0700 (PDT) From: Thierry Reding To: Russell King , arm@kernel.org Subject: [PATCH 5/6] ARM64: Remove arm_pm_restart() Date: Tue, 15 Oct 2019 16:51:46 +0200 Message-Id: <20191015145147.1106247-6-thierry.reding@gmail.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191015145147.1106247-1-thierry.reding@gmail.com> References: <20191015145147.1106247-1-thierry.reding@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20191015_075206_088384_B4597068 X-CRM114-Status: GOOD ( 13.99 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Lorenzo Pieralisi , Arnd Bergmann , Stefano Stabellini , Catalin Marinas , linux-kernel@vger.kernel.org, Stefan Agner , Wolfram Sang , linux-arm-kernel@lists.infradead.org, Olof Johansson , Guenter Roeck Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Guenter Roeck All users of arm_pm_restart() have been converted to use the kernel restart handler. Acked-by: Arnd Bergmann Reviewed-by: Wolfram Sang Tested-by: Wolfram Sang Acked-by: Catalin Marinas Signed-off-by: Guenter Roeck Signed-off-by: Thierry Reding --- arch/arm64/include/asm/system_misc.h | 2 -- arch/arm64/kernel/process.c | 7 +------ 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/arch/arm64/include/asm/system_misc.h b/arch/arm64/include/asm/system_misc.h index 1ab63cfbbaf1..d02c5e5ea015 100644 --- a/arch/arm64/include/asm/system_misc.h +++ b/arch/arm64/include/asm/system_misc.h @@ -32,8 +32,6 @@ void hook_debug_fault_code(int nr, int (*fn)(unsigned long, unsigned int, struct mm_struct; extern void __show_regs(struct pt_regs *); -extern void (*arm_pm_restart)(enum reboot_mode reboot_mode, const char *cmd); - #endif /* __ASSEMBLY__ */ #endif /* __ASM_SYSTEM_MISC_H */ diff --git a/arch/arm64/kernel/process.c b/arch/arm64/kernel/process.c index a47462def04b..f11d2b261b4e 100644 --- a/arch/arm64/kernel/process.c +++ b/arch/arm64/kernel/process.c @@ -64,8 +64,6 @@ EXPORT_SYMBOL(__stack_chk_guard); void (*pm_power_off)(void); EXPORT_SYMBOL_GPL(pm_power_off); -void (*arm_pm_restart)(enum reboot_mode reboot_mode, const char *cmd); - static void __cpu_do_idle(void) { dsb(sy); @@ -195,10 +193,7 @@ void machine_restart(char *cmd) efi_reboot(reboot_mode, NULL); /* Now call the architecture specific reboot code. */ - if (arm_pm_restart) - arm_pm_restart(reboot_mode, cmd); - else - do_kernel_restart(cmd); + do_kernel_restart(cmd); /* * Whoops - the architecture was unable to reboot. -- 2.23.0 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel