From patchwork Mon Dec 14 18:57:19 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 7847071 X-Patchwork-Delegate: geert@linux-m68k.org Return-Path: X-Original-To: patchwork-linux-sh@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id E8E9B9F3CD for ; Mon, 14 Dec 2015 18:59:01 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 10F2C20361 for ; Mon, 14 Dec 2015 18:59:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 394E920382 for ; Mon, 14 Dec 2015 18:59:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932163AbbLNS67 (ORCPT ); Mon, 14 Dec 2015 13:58:59 -0500 Received: from andre.telenet-ops.be ([195.130.132.53]:45711 "EHLO andre.telenet-ops.be" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932156AbbLNS5r (ORCPT ); Mon, 14 Dec 2015 13:57:47 -0500 Received: from ayla.of.borg ([84.195.106.123]) by andre.telenet-ops.be with bizsmtp id tWxi1r00p2fm56U01WxiUc; Mon, 14 Dec 2015 19:57:43 +0100 Received: from ramsan.of.borg ([192.168.97.29] helo=ramsan) by ayla.of.borg with esmtp (Exim 4.82) (envelope-from ) id 1a8YJa-0002tg-4t; Mon, 14 Dec 2015 19:57:42 +0100 Received: from geert by ramsan with local (Exim 4.82) (envelope-from ) id 1a8YJd-0000HO-JD; Mon, 14 Dec 2015 19:57:45 +0100 From: Geert Uytterhoeven To: Greg Kroah-Hartman , Simon Horman , Magnus Damm , Yoshinori Sato Cc: linux-serial@vger.kernel.org, linux-sh@vger.kernel.org, Geert Uytterhoeven Subject: [PATCH v3 10/27] serial: sh-sci: Convert from clk_get() to devm_clk_get() Date: Mon, 14 Dec 2015 19:57:19 +0100 Message-Id: <1450119456-964-11-git-send-email-geert+renesas@glider.be> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1450119456-964-1-git-send-email-geert+renesas@glider.be> References: <1450119456-964-1-git-send-email-geert+renesas@glider.be> Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, 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 Transfer clock cleanup handling to the core device management code. Signed-off-by: Geert Uytterhoeven Acked-by: Greg Kroah-Hartman --- v3: - Add Acked-by, - Convert "sci_fck", as its removal has been moved after the BRG patches. --- drivers/tty/serial/sh-sci.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c index 136ad2f633413cbc..b9eb4b525c0a7571 100644 --- a/drivers/tty/serial/sh-sci.c +++ b/drivers/tty/serial/sh-sci.c @@ -2216,7 +2216,7 @@ static struct uart_ops sci_uart_ops = { static int sci_init_clocks(struct sci_port *sci_port, struct device *dev) { /* Get the SCI functional clock. It's called "fck" on ARM. */ - sci_port->fclk = clk_get(dev, "fck"); + sci_port->fclk = devm_clk_get(dev, "fck"); if (PTR_ERR(sci_port->fclk) == -EPROBE_DEFER) return -EPROBE_DEFER; if (!IS_ERR(sci_port->fclk)) @@ -2226,14 +2226,14 @@ static int sci_init_clocks(struct sci_port *sci_port, struct device *dev) * But it used to be called "sci_ick", and we need to maintain DT * backward compatibility. */ - sci_port->fclk = clk_get(dev, "sci_ick"); + sci_port->fclk = devm_clk_get(dev, "sci_ick"); if (PTR_ERR(sci_port->fclk) == -EPROBE_DEFER) return -EPROBE_DEFER; if (!IS_ERR(sci_port->fclk)) return 0; /* SH has historically named the clock "sci_fck". */ - sci_port->fclk = clk_get(dev, "sci_fck"); + sci_port->fclk = devm_clk_get(dev, "sci_fck"); if (!IS_ERR(sci_port->fclk)) return 0; @@ -2241,7 +2241,7 @@ static int sci_init_clocks(struct sci_port *sci_port, struct device *dev) * Not all SH platforms declare a clock lookup entry for SCI devices, * in which case we need to get the global "peripheral_clk" clock. */ - sci_port->fclk = clk_get(dev, "peripheral_clk"); + sci_port->fclk = devm_clk_get(dev, "peripheral_clk"); if (!IS_ERR(sci_port->fclk)) return 0; @@ -2400,8 +2400,6 @@ static int sci_init_single(struct platform_device *dev, static void sci_cleanup_single(struct sci_port *port) { - clk_put(port->fclk); - pm_runtime_disable(port->port.dev); }