From patchwork Thu Mar 14 22:34:10 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Enrico Weigelt, metux IT consult" X-Patchwork-Id: 10853795 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 3D7CC17EF for ; Thu, 14 Mar 2019 22:36:43 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 298662A78A for ; Thu, 14 Mar 2019 22:36:43 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1CAE92A7B5; Thu, 14 Mar 2019 22:36:43 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B4FAF2A78A for ; Thu, 14 Mar 2019 22:36:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728273AbfCNWfX (ORCPT ); Thu, 14 Mar 2019 18:35:23 -0400 Received: from mout.kundenserver.de ([217.72.192.74]:43149 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728255AbfCNWfX (ORCPT ); Thu, 14 Mar 2019 18:35:23 -0400 Received: from orion.localdomain ([95.117.89.18]) by mrelayeu.kundenserver.de (mreue107 [212.227.15.183]) with ESMTPSA (Nemesis) id 1Mleo0-1gdVfA0sFe-00inf4; Thu, 14 Mar 2019 23:35:10 +0100 From: "Enrico Weigelt, metux IT consult" To: linux-kernel@vger.kernel.org Cc: gregkh@linuxfoundation.org, eric@anholt.net, stefan.wahren@i2se.com, f.fainelli@gmail.com, rjui@broadcom.com, sbranden@broadcom.com, bcm-kernel-feedback-list@broadcom.com, andriy.shevchenko@linux.intel.com, vz@mleia.com, matthias.bgg@gmail.com, yamada.masahiro@socionext.com, tklauser@distanz.ch, richard.genoud@gmail.com, macro@linux-mips.org, u.kleine-koenig@pengutronix.de, kernel@pengutronix.de, slemieux.tyco@gmail.com, andy.gross@linaro.org, david.brown@linaro.org, shawnguo@kernel.org, s.hauer@pengutronix.de, festevam@gmail.com, linux-imx@nxp.com, baohua@kernel.org, jacmet@sunsite.dk, linux-serial@vger.kernel.org, linux-arm-msm@vger.kernel.org, linuxppc-dev@lists.ozlabs.org Subject: [PATCH v2 40/45] drivers: tty: serial: mpc52xx_uart: use devm_* functions Date: Thu, 14 Mar 2019 23:34:10 +0100 Message-Id: <1552602855-26086-41-git-send-email-info@metux.net> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1552602855-26086-1-git-send-email-info@metux.net> References: <1552602855-26086-1-git-send-email-info@metux.net> X-Provags-ID: V03:K1:c1rt79CARMfMM9EBJpf2Yu57RYWt58bo9ABQPOFK1jRMIOMpF1c oERWiyR8NT2Hs6fiUeQh+ZK8EWSU8jOM0bvCWsYu8SH3F0GWyIQenc2T0xWMBp5MB1YMnvT 9cynd8W3QrXWT9wBlQFnMjW4d7BXcM2YtTfRKGBDbumX8QmF7o8cHizhL+OwOn+w5qfe2Ht cW5yG5F00Ulas+z5PWyXg== X-UI-Out-Filterresults: notjunk:1;V03:K0:F/NcajlvdU0=:SR2u22OvyWH/qkqQz/MLuF IcOzVV/NpdhleuU+i+zgwL7Qod6fUaBYm3pwqKfWLa2p1BABwDKabcIRBnXqcCF8WVx4Ap+JW MG4Oy/y0FbDnMNV4+mrGaF7OfjlPJ5Wo8efmVNoNzOHfsxj4ZTzoc+jspuasnSKuWXlfVYfZ5 6AHSfiDuu2SfyJQAvvCNssOlwiI4RJ4ZMS5Pj2tlSQlzzH6WR1zU+SKYOIJDCF+VMnKrTfk2M 62quOX228RiyMKg03cIWJKomzvJx6U0lKyAN/yhqBf8JSawYATbTh5Rjnw3lv3lsa7OnHV3is Gx/IHqpM2x5EIB+QKq10Wp7jZ8gQQDOEvLikVh22hynFBhr2MY0Qe5whkDqVgzI6xBLlqX5SA 8HyfI5jVRyAbDKZ8sATvP8XN2xjaYMppci0+A7LIAIG5rELg12w85FTROOttJNNWbbGcWiv4+ VLn8uyKtNNq17qBuKm+Vfh0j3NT/6l8Wv62NjUYvDfi5wre1CUbYpu+pgpDihnLIWidUMnKam 5jf/TZSINDlxz/3kYz+w4W+qEjA0gIh0SeaRJKYa33HnzYV3C+BE1GN2w5yzZQh+cscErdStw 7YCjIp65cCCpMouqxQT3qvytLgZlb9ryk5IVJnraits+8HqvO4aK86YxxbTtUekZaVTZ6+y7s PfhGtCEhaHWM8M7taRvwUUTrcCTDcjYUqAEKsLwkC1HmCXRYKpZVJ9DDaNKy1wV4KevKG4W+8 XPboeXfkX2Baj/uT+CZxFBF2GzItZj2FLsnJlA== Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Use the safer devm versions of memory mapping functions. Signed-off-by: Enrico Weigelt, metux IT consult --- drivers/tty/serial/mpc52xx_uart.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/drivers/tty/serial/mpc52xx_uart.c b/drivers/tty/serial/mpc52xx_uart.c index 3a75ee0..3e74e44 100644 --- a/drivers/tty/serial/mpc52xx_uart.c +++ b/drivers/tty/serial/mpc52xx_uart.c @@ -1276,11 +1276,13 @@ static u8 mpc5125_psc_get_mr1(struct uart_port *port) /* remapped by us ? */ if (port->flags & UPF_IOREMAP) { - iounmap(port->membase); + devm_iounmap(port->dev, port->membase); port->membase = NULL; } - release_mem_region(port->mapbase, sizeof(struct mpc52xx_psc)); + devm_release_mem_region(port->dev, + port->mapbase, + sizeof(struct mpc52xx_psc)); } static int @@ -1289,13 +1291,14 @@ static u8 mpc5125_psc_get_mr1(struct uart_port *port) int err; if (port->flags & UPF_IOREMAP) /* Need to remap ? */ - port->membase = ioremap(port->mapbase, + port->membase = devm_ioremap(port->dev, port->mapbase, sizeof(struct mpc52xx_psc)); if (!port->membase) return -EINVAL; - err = request_mem_region(port->mapbase, sizeof(struct mpc52xx_psc), + err = devm_request_mem_region(port->mapbase, + sizeof(struct mpc52xx_psc), "mpc52xx_psc_uart") != NULL ? 0 : -EBUSY; if (err) @@ -1310,10 +1313,12 @@ static u8 mpc5125_psc_get_mr1(struct uart_port *port) return 0; out_mapregion: - release_mem_region(port->mapbase, sizeof(struct mpc52xx_psc)); + devm_release_mem_region(port->dev, + port->mapbase, + sizeof(struct mpc52xx_psc)); out_membase: if (port->flags & UPF_IOREMAP) { - iounmap(port->membase); + devm_iounmap(port->dev, port->membase); port->membase = NULL; } return err; @@ -1653,7 +1658,9 @@ static u8 mpc5125_psc_get_mr1(struct uart_port *port) port->uartclk = uartclk; port->ops = &mpc52xx_uart_ops; port->mapbase = res.start; - port->membase = ioremap(res.start, sizeof(struct mpc52xx_psc)); + port->membase = devm_ioremap(port->dev, + res.start, + sizeof(struct mpc52xx_psc)); port->irq = irq_of_parse_and_map(np, 0); if (port->membase == NULL)