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 1D886C10F14 for ; Tue, 15 Oct 2019 14:53:33 +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 D19A12054F for ; Tue, 15 Oct 2019 14:53:32 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="lBPPzuDE"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="jsHwC6na" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D19A12054F 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=2LWfrI5e81PqM761kKfI9fvXJ7dLMrsCmzX18cqU1kA=; b=lBPPzuDEy6/vbF sqD5I5fdpKO1r/eAJW8eucLyuS4TkSNl7MON60I5XjLZss4jtG+L2WYwJIKt+RxFFtmz/voxU+v8D txWk7aVBxaOIetD7EPRQyWMCEr/yw6kQKq4+T3xSKZ+Ol2Xc9TEyydnpLKW+JhuPtp5eJIm7JrXZz VeJPuCWJdWuPxvRS+G75+cZAc+j3UV4FUsDfjM311um+Vz4JYBiy/y0eqLECFzMC+FO/pJrhm/NLq 4EkHYs5G9FJDR7wCWaDSMybAAZfGIUYfnyj/An96RbdB1l4NcsGOtIOhsyG6GxkAP6AQbtiw790Nq 2/5JquXWPzCgKP2opJ2A==; 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 1iKOCT-0003TA-KI; Tue, 15 Oct 2019 14:53:25 +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 1iKOBD-0002IZ-H1 for linux-arm-kernel@lists.infradead.org; Tue, 15 Oct 2019 14:52:09 +0000 Received: by mail-wr1-x441.google.com with SMTP id b9so24277126wrs.0 for ; Tue, 15 Oct 2019 07:52:07 -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=RPFfIsUzztDTg5YJoInm2ijzJI5IXTRMvl5P10kjmeg=; b=jsHwC6naQ5OuX54RSY+JJuYPK14+nigXz2HztsdprGqMfWYb9QmazRRVkibp0y9Lel bcIiIPU6RKwHbrNCiGloBmwIrHIF2UVGRn70Kgii4VC1cdPy4GCjwm18mO+1Xk5ERt12 D06tPHqW7exAlyJQ1YnLk8kfBKHkVNuUN5e4pqhyWMpQwZXKmvyX20GVmPm5Q4OkwrSM /3WyxRnOAhC0cUvsICMi9KBjGNqM4Y1bfFwlj1bnWoYdew3sWgg4FRbInUzHbNQfDbr4 R0Lj34korClWN8dwDzCoAm+Of5tkiPxZ1+NWasJm7xKDTvC6l69fDGHEzi3qDLd5qQvN QevA== 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=RPFfIsUzztDTg5YJoInm2ijzJI5IXTRMvl5P10kjmeg=; b=OWAn64nNQTPZWRBVUeKpXDWx4qTRzS/BwW39ixkuvLGNTVRoOK2QHcrAAGjUIMYKUQ 2Gql5ptMuadcika8SdRKeKkZpTw9mDDSFDmckKXGM1g2Z12gHde7kGgfcXB5da/50e1n Q6yHbj2Im5VS+kGwqpcomEw186iSkeVwf5DbJoe1YyIi7pQZqCPfx4RyL4A6ZJvJsUAa Z0ABAfimUmWn+mOh0rkUvgJmjUzZ5+gYcAb5pF/QundHll/o7YWj0C5mrfj3aj1TSlOr GeRQKp9yIpiM+ICDG93WUIc8GBoLZfrg3CnnWrrNFdm2eR1KOXfzSzcexZNExSc5eqH+ pdyQ== X-Gm-Message-State: APjAAAU/Nd2wplITYrNprOig2uymBbEgGlQLaRLj3I++UrWrT4eLV7rY Dl9xz1eq9gj5As9qs0UybvQ= X-Google-Smtp-Source: APXvYqx6B/AkW6uHHqhBbtnHKOlMAiP2BhuoLGzI382W7+pRlx+dKDoKs6XGsxHH1Asvk4JHIsTrTg== X-Received: by 2002:a5d:4a87:: with SMTP id o7mr5082013wrq.374.1571151125302; Tue, 15 Oct 2019 07:52:05 -0700 (PDT) Received: from localhost (p2E5BE2CE.dip0.t-ipconnect.de. [46.91.226.206]) by smtp.gmail.com with ESMTPSA id r7sm20592001wrt.28.2019.10.15.07.52.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Oct 2019 07:52:04 -0700 (PDT) From: Thierry Reding To: Russell King , arm@kernel.org Subject: [PATCH 6/6] ARM: Remove arm_pm_restart() Date: Tue, 15 Oct 2019 16:51:47 +0200 Message-Id: <20191015145147.1106247-7-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_075207_688557_D2F68F09 X-CRM114-Status: GOOD ( 13.56 ) 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 Signed-off-by: Guenter Roeck Signed-off-by: Thierry Reding --- arch/arm/include/asm/system_misc.h | 1 - arch/arm/kernel/reboot.c | 6 +----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/arch/arm/include/asm/system_misc.h b/arch/arm/include/asm/system_misc.h index 66f6a3ae68d2..98b37340376b 100644 --- a/arch/arm/include/asm/system_misc.h +++ b/arch/arm/include/asm/system_misc.h @@ -13,7 +13,6 @@ extern void cpu_init(void); void soft_restart(unsigned long); -extern void (*arm_pm_restart)(enum reboot_mode reboot_mode, const char *cmd); extern void (*arm_pm_idle)(void); #ifdef CONFIG_HARDEN_BRANCH_PREDICTOR diff --git a/arch/arm/kernel/reboot.c b/arch/arm/kernel/reboot.c index bb18ed0539f4..1076b26aa699 100644 --- a/arch/arm/kernel/reboot.c +++ b/arch/arm/kernel/reboot.c @@ -18,7 +18,6 @@ typedef void (*phys_reset_t)(unsigned long, bool); /* * Function pointers to optional machine specific functions */ -void (*arm_pm_restart)(enum reboot_mode reboot_mode, const char *cmd); void (*pm_power_off)(void); EXPORT_SYMBOL(pm_power_off); @@ -138,10 +137,7 @@ void machine_restart(char *cmd) local_irq_disable(); smp_send_stop(); - if (arm_pm_restart) - arm_pm_restart(reboot_mode, cmd); - else - do_kernel_restart(cmd); + do_kernel_restart(cmd); /* Give a grace period for failure to restart of 1s */ mdelay(1000); -- 2.23.0 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel