From patchwork Wed Sep 19 05:28:12 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 146996 Delivered-To: patch@linaro.org Received: by 2002:a2e:1648:0:0:0:0:0 with SMTP id 8-v6csp276325ljw; Tue, 18 Sep 2018 22:29:47 -0700 (PDT) X-Google-Smtp-Source: ANB0VdYthoG6mFW87/I4iw31YHJ6na6afWyIXqkicNq2TWPlLqhnKityj0hVGzSTgY+ZOb/KVlmG X-Received: by 2002:a62:1815:: with SMTP id 21-v6mr33862382pfy.227.1537334987619; Tue, 18 Sep 2018 22:29:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1537334987; cv=none; d=google.com; s=arc-20160816; b=QNlf7MGuFHKyWLIvKuUynaqcBVzMAK4BkTiDLGgvGY5ONvr00MqeoP13Gd2Qdt6oJr HH4NyhiVcc26KafTzR4vLJ7PWsIpyfH3f42ZHdii57mB7+RsK27ngkwWBhYzjuxbj5i6 cDwDD93ODtBAwic21O2OtaIPPD/iAZdgY30aIpoVE+LAkLr4IU6Huth40qNVP+r3TxJR ANHJx0mWljPr3DtlxwvGy7EXEAc4BWJjisyorkXCknlhlbmflOeT6OKFv1doVsVuIe47 L9UHX0on/fcqk9OokxY49ivJFmLspWsacAp6NBCW/rB4CBhd8tub3QWBydaiNMKYnn9m a9qg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:dkim-filter; bh=yiszHmXZYmVw9rgfzdxM58x4hbs7T2QUqJBQH2oKjMA=; b=AN5vksAwtH18FI2WhLzFOQqvqK+/13xu+2OxGlCmGma/Z5mPhqI/WhVTarKQ/yQVI+ QXMpf3JWcZ/YoQrVZumYaV1ERVFWZwqwt3GEac1k/rvIjqduN4WBQ60ZHAmaHXKIGjJx Q9hQ/94M2FtLRE3hVlH8OHYikM1MM4Up2dN0VqZzN/o9c8rK3hCoQ1MdjcBV3C6XVR4d 5Ys0vWpRKtk/nKXxSwuJNtq1AbvrL0LRll/LtvX32/45dvEw5yjjG34EOS7YpdDrbSnd vN86rj53yC+8b8jjeaupe0OcbpJXWMunpuGIR5uP7nvV6h0jEqRqwuMgqvJH3PBs9qKv dKiw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=cs8vYqFT; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id x3-v6si16866911plr.138.2018.09.18.22.29.47; Tue, 18 Sep 2018 22:29:47 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=cs8vYqFT; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730863AbeISLFv (ORCPT + 32 others); Wed, 19 Sep 2018 07:05:51 -0400 Received: from conuserg-09.nifty.com ([210.131.2.76]:61299 "EHLO conuserg-09.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730688AbeISLFu (ORCPT ); Wed, 19 Sep 2018 07:05:50 -0400 Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-09.nifty.com with ESMTP id w8J5Sefb016652; Wed, 19 Sep 2018 14:28:42 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-09.nifty.com w8J5Sefb016652 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1537334922; bh=yiszHmXZYmVw9rgfzdxM58x4hbs7T2QUqJBQH2oKjMA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cs8vYqFTnu5xeHf3JbeXhJvWb0UmibOlhXJE+h3HqDfoNiBjFC/QpYhAaEYaA63sn wwzJQl64LQpdROp/pYERKeD3Z+0BxjPzi6zAD5UFRBxumuSlmpSJ2iqIIQDft0SgQ6 DgDQ4XpIMakZquc3UicPMWahXnkU52QIWaeevFz8cKmt1fhrdtgpHAO2g3xS64Aawv F4fNaNVetN4NQu2NBksF1bg6e7EgHcQaopLciCDLscMvB+qtPMZRnLKW03Iv9RQxim XLtxAixHGtHcOjs/2DQt0TygH1J8mpoqIGlklTE357zyEYBKxWq1nY1DB6fitzrWp1 HQ5qjeKYlqnvg== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: Greg KH , linux-serial@vger.kernel.org Cc: devicetree@vger.kernel.org, Rob Herring , Dai Okamura , Masahiro Yamada , Jiri Slaby , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH 2/3] serial: 8250_uniphier: flatten probe function Date: Wed, 19 Sep 2018 14:28:12 +0900 Message-Id: <1537334893-26079-3-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1537334893-26079-1-git-send-email-yamada.masahiro@socionext.com> References: <1537334893-26079-1-git-send-email-yamada.masahiro@socionext.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Currently, the DT-related settings are split out to uniphier_of_serial_setup(), but it turned out to be not nice. The next commit will add a DT property, but it will not fit in the helper. Merge the helper into the probe function. Signed-off-by: Masahiro Yamada --- drivers/tty/serial/8250/8250_uniphier.c | 49 ++++++++++++--------------------- 1 file changed, 17 insertions(+), 32 deletions(-) -- 2.7.4 diff --git a/drivers/tty/serial/8250/8250_uniphier.c b/drivers/tty/serial/8250/8250_uniphier.c index d292654..1028c02 100644 --- a/drivers/tty/serial/8250/8250_uniphier.c +++ b/drivers/tty/serial/8250/8250_uniphier.c @@ -155,36 +155,6 @@ static void uniphier_serial_dl_write(struct uart_8250_port *up, int value) writel(value, up->port.membase + UNIPHIER_UART_DLR); } -static int uniphier_of_serial_setup(struct device *dev, struct uart_port *port, - struct uniphier8250_priv *priv) -{ - int ret; - u32 prop; - struct device_node *np = dev->of_node; - - ret = of_alias_get_id(np, "serial"); - if (ret < 0) { - dev_err(dev, "failed to get alias id\n"); - return ret; - } - port->line = ret; - - /* Get clk rate through clk driver */ - priv->clk = devm_clk_get(dev, NULL); - if (IS_ERR(priv->clk)) { - dev_err(dev, "failed to get clock\n"); - return PTR_ERR(priv->clk); - } - - ret = clk_prepare_enable(priv->clk); - if (ret < 0) - return ret; - - port->uartclk = clk_get_rate(priv->clk); - - return 0; -} - static int uniphier_uart_probe(struct platform_device *pdev) { struct device *dev = &pdev->dev; @@ -217,9 +187,24 @@ static int uniphier_uart_probe(struct platform_device *pdev) memset(&up, 0, sizeof(up)); - ret = uniphier_of_serial_setup(dev, &up.port, priv); - if (ret < 0) + ret = of_alias_get_id(dev->of_node, "serial"); + if (ret < 0) { + dev_err(dev, "failed to get alias id\n"); return ret; + } + up.port.line = ret; + + priv->clk = devm_clk_get(dev, NULL); + if (IS_ERR(priv->clk)) { + dev_err(dev, "failed to get clock\n"); + return PTR_ERR(priv->clk); + } + + ret = clk_prepare_enable(priv->clk); + if (ret) + return ret; + + up.port.uartclk = clk_get_rate(priv->clk); spin_lock_init(&priv->atomic_write_lock);