From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f173.google.com (mail-pl1-f173.google.com [209.85.214.173]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 54C653B102F for ; Tue, 9 Jun 2026 22:37:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.173 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781044660; cv=none; b=OmwMCJ35hcVWRayXB/cw2jr+nmw5CyOorrCBkqEyfPnDfjV/gQajZ4xnC+6TxQJXloeO7vuAsCB3pDJEDQhP+dgl+TaE2pUudedqUA8vLI/D0DZStTt/GmPtiiXqpFDxlPTEG1za6Moj8AbSXTj0oDImBEhWRqwL9/iTqjEDY54= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781044660; c=relaxed/simple; bh=VuqAk7fmE2Ltz5WBlY6dQwYowm3411vf/6KNWP2/3e0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=oTBjogwEeLG81wgfQlXilGQ30SZYDjxriMZu2D2FcG1g6uZKRoOMSLsR8XlOCu7tJndqVo6CAWLf1yytlpZF+cKT96iLvoswxsoNDtP/JDfVsMOS3HRyZ+Es7WRcx2YMGC74YN6fwydyPltkpYPDvAMnLONicWZQHIxgD/O25yo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=eDSBY2lq; arc=none smtp.client-ip=209.85.214.173 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="eDSBY2lq" Received: by mail-pl1-f173.google.com with SMTP id d9443c01a7336-2c0c3184c71so46943745ad.1 for ; Tue, 09 Jun 2026 15:37:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1781044659; x=1781649459; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=jagaY783ZQexk/NjgnRY09dQ8WqyYDUPOGhKANIhzfg=; b=eDSBY2lqnU7KzL3ys9jqRV8PkdIbmkzGyrbjtMPHSMvySTPnH3fyeiYgUKMjUrgN6G +eJVrOg6s67x/PrzLxo/3LB5GuX12sx+TLHVX8IgJecus3pf5CVg+kBKlP7zzujN7Ad0 +DB7134aEhiSAxIfgQJZj+6ZO3piwh54VRhohdqC+GeOMNxKksGIxWNBpWILvOjTqAgX ImaAsXXsDY+I5WMsKbXx/sYHrzpWUfzDdoXS2PBpga5sZ22WuW8xyQCN0t6JGrXG3XfC MyCkv6cjIs+a08SxjI5yi2rC8OJPaMtS6sC9zSy8sT5oWJEpW9ccxOcfFsPg01TwTGzp Pfhw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781044659; x=1781649459; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=jagaY783ZQexk/NjgnRY09dQ8WqyYDUPOGhKANIhzfg=; b=WJd+VTSLP2zxEBgypB7RsWh/5YV332E44Zndc/7SsC82q7Zax1aftJaF2PPwJUYk7W NR5+kfFI09L5IlqbB0d+s8vPwNxR0qo5DgjWK9jS/kh/gkvP2Bo9e4ZeQ8+aleNkuOwX XXqQlEqZY4Q9SJ0pSW9qLloV4XhmZKSmrTvPqGFO45w0VnPpe1axO15RQPJZL88jKSye imoJcEF9fzWPZY4Cgv5xvpeWzFQOVNYoRW8ND7wIZcdDxw+f96g+oCG9JFrfFftJu+GT Gsu+4+7oVyw5sioIyezGZbxTft027jWXggMRc6JJ/Aj5Rhdy2quSULfJmkdxHKxHvc0G 5CuQ== X-Gm-Message-State: AOJu0Yx57rHNjCVr+nDrK5WlcMpMMW8ZE4sahL+F7fFh+hAEHnM+MNJ5 EYgLT50dVgcA+NEuPEzNCII7mA5P1K+X+uwYc6UZzHRDmrga7p3MW+rkz5sedb0i X-Gm-Gg: Acq92OF9jpu43PRC7x1Y7mV+NizdR5GpU7QhUwoAVQdCR5qUzKcITGYI5oY5xQTb5NZ 1n7y2I1MZu8fX+Zq0fvr6Vhm733uU7HuYigctBdU/jRiQzhZK9z0wCkYj9NWo/9vaLDF3W5Ja/L 1iwZ/np1ixrsNINh5AYHgKPGVpjHgP/SSYoboSNrQye/UNP75SpswEWXbXfdJZ9Cos9Is2HSZBZ yn/eElEvAjeHSOM1gyhuWGQprxqRNbCep2oa0nrVX3dv5FPl4Ot16k133Mo9N/tEegxKUH5hA/E N2nmdFA7Bahj+D603hUkhRhfTVjX31dUoLuJhqI/IPrTUwavqbCxh8OC4dExACq85FeIFJRcfGh qD4SlM1MIswen9NrjKzRRC1Tl3XerYSJ4dL7aIO5Pa0c1mULkPDkvnx+H6f+Hx1jy9L/nDotxJA uopIj0z/TNsfiK75xGSq3JarMTrpFI5ZGnAnJ7vXqrMXyJdwsXQo4/8W/SDc13O8brdPx2afrtc lsg7oH94Skr1k8gy40wmHdx/Kh+G30H0Xs5g3s1RBvxzA== X-Received: by 2002:a17:903:290f:b0:2c0:f807:a760 with SMTP id d9443c01a7336-2c1e7e51dd8mr158956345ad.13.1781044658617; Tue, 09 Jun 2026 15:37:38 -0700 (PDT) Received: from ryzen ([2601:644:8000:5b5d:7285:c2ff:fe45:8a32]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2c164f6d37esm293750655ad.9.2026.06.09.15.37.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Jun 2026 15:37:38 -0700 (PDT) From: Rosen Penev To: linux-serial@vger.kernel.org Cc: Greg Kroah-Hartman , Jiri Slaby , Frank Li , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , linux-kernel@vger.kernel.org (open list:TTY LAYER AND SERIAL DRIVERS), imx@lists.linux.dev (open list:ARM/FREESCALE IMX / MXC ARM ARCHITECTURE), linux-arm-kernel@lists.infradead.org (moderated list:ARM/FREESCALE IMX / MXC ARM ARCHITECTURE) Subject: [PATCHv2 3/4] serial: mxs-auart: use devm resources for iomem and GPIO IRQs Date: Tue, 9 Jun 2026 15:37:16 -0700 Message-ID: <20260609223717.41670-4-rosenp@gmail.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260609223717.41670-1-rosenp@gmail.com> References: <20260609223717.41670-1-rosenp@gmail.com> Precedence: bulk X-Mailing-List: linux-serial@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Replace platform_get_resource + ioremap with devm_platform_get_and_ioremap_resource and convert GPIO IRQ request_irq/free_irq to devm_request_irq. This eliminates the mxs_auart_free_gpio_irq function and its call sites, and the out_iounmap error label. Simplify the remove function accordingly. Assisted-by: opencode:big-pickle Signed-off-by: Rosen Penev --- drivers/tty/serial/mxs-auart.c | 53 +++++++--------------------------- 1 file changed, 11 insertions(+), 42 deletions(-) diff --git a/drivers/tty/serial/mxs-auart.c b/drivers/tty/serial/mxs-auart.c index aa59a48bfad7..4499e3206e85 100644 --- a/drivers/tty/serial/mxs-auart.c +++ b/drivers/tty/serial/mxs-auart.c @@ -1517,15 +1517,6 @@ static int mxs_auart_init_gpios(struct mxs_auart_port *s, struct device *dev) return 0; } -static void mxs_auart_free_gpio_irq(struct mxs_auart_port *s) -{ - enum mctrl_gpio_idx i; - - for (i = 0; i < UART_GPIO_MAX; i++) - if (s->gpio_irq[i] >= 0) - free_irq(s->gpio_irq[i], s); -} - static int mxs_auart_request_gpio_irq(struct mxs_auart_port *s) { int *irq = s->gpio_irq; @@ -1537,21 +1528,13 @@ static int mxs_auart_request_gpio_irq(struct mxs_auart_port *s) continue; irq_set_status_flags(irq[i], IRQ_NOAUTOEN); - err = request_irq(irq[i], mxs_auart_irq_handle, - IRQ_TYPE_EDGE_BOTH, dev_name(s->dev), s); + err = devm_request_irq(s->dev, irq[i], mxs_auart_irq_handle, + IRQ_TYPE_EDGE_BOTH, dev_name(s->dev), s); if (err) dev_err(s->dev, "%s - Can't get %d irq\n", __func__, irq[i]); } - /* - * If something went wrong, rollback. - * Be careful: i may be unsigned. - */ - while (err && (i-- > 0)) - if (irq[i] >= 0) - free_irq(irq[i], s); - return err; } @@ -1596,18 +1579,12 @@ static int mxs_auart_probe(struct platform_device *pdev) if (ret) return ret; - r = platform_get_resource(pdev, IORESOURCE_MEM, 0); - if (!r) { - ret = -ENXIO; + s->port.membase = devm_platform_get_and_ioremap_resource(pdev, 0, &r); + if (IS_ERR(s->port.membase)) { + ret = PTR_ERR(s->port.membase); goto out_disable_clk; } - s->port.mapbase = r->start; - s->port.membase = ioremap(r->start, resource_size(r)); - if (!s->port.membase) { - ret = -ENOMEM; - goto out_disable_clk; - } s->port.ops = &mxs_auart_ops; s->port.iotype = UPIO_MEM; s->port.fifosize = MXS_AUART_FIFO_SIZE; @@ -1622,21 +1599,21 @@ static int mxs_auart_probe(struct platform_device *pdev) irq = platform_get_irq(pdev, 0); if (irq < 0) { ret = irq; - goto out_iounmap; + goto out_disable_clk; } s->port.irq = irq; ret = devm_request_irq(&pdev->dev, irq, mxs_auart_irq_handle, 0, dev_name(&pdev->dev), s); if (ret) - goto out_iounmap; + goto out_disable_clk; platform_set_drvdata(pdev, s); ret = mxs_auart_init_gpios(s, &pdev->dev); if (ret) { dev_err(&pdev->dev, "Failed to initialize GPIOs.\n"); - goto out_iounmap; + goto out_disable_clk; } /* @@ -1644,7 +1621,7 @@ static int mxs_auart_probe(struct platform_device *pdev) */ ret = mxs_auart_request_gpio_irq(s); if (ret) - goto out_iounmap; + goto out_disable_clk; auart_port[s->port.line] = s; @@ -1667,11 +1644,7 @@ static int mxs_auart_probe(struct platform_device *pdev) return 0; out_free_qpio_irq: - mxs_auart_free_gpio_irq(s); - auart_port[pdev->id] = NULL; - -out_iounmap: - iounmap(s->port.membase); + auart_port[s->port.line] = NULL; out_disable_clk: clk_disable_unprepare(s->clk); @@ -1683,11 +1656,7 @@ static void mxs_auart_remove(struct platform_device *pdev) struct mxs_auart_port *s = platform_get_drvdata(pdev); uart_remove_one_port(&auart_driver, &s->port); - auart_port[pdev->id] = NULL; - mxs_auart_free_gpio_irq(s); - iounmap(s->port.membase); - if (is_asm9260_auart(s)) - clk_disable_unprepare(s->clk); + auart_port[s->port.line] = NULL; } static struct platform_driver mxs_auart_driver = { -- 2.54.0