From: Hector Martin <marcan@marcan.st>
To: linux-arm-kernel@lists.infradead.org
Cc: Hector Martin <marcan@marcan.st>, Marc Zyngier <maz@kernel.org>,
Rob Herring <robh@kernel.org>, Arnd Bergmann <arnd@kernel.org>,
Olof Johansson <olof@lixom.net>,
Krzysztof Kozlowski <krzk@kernel.org>,
Mark Kettenis <mark.kettenis@xs4all.nl>,
Tony Lindgren <tony@atomide.com>,
Mohamed Mediouni <mohamed.mediouni@caramail.com>,
Stan Skowronek <stan@corellium.com>,
Alexander Graf <graf@amazon.com>, Will Deacon <will@kernel.org>,
Linus Walleij <linus.walleij@linaro.org>,
Mark Rutland <mark.rutland@arm.com>,
Andy Shevchenko <andy.shevchenko@gmail.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Jonathan Corbet <corbet@lwn.net>,
Catalin Marinas <catalin.marinas@arm.com>,
Christoph Hellwig <hch@infradead.org>,
"David S. Miller" <davem@davemloft.net>,
devicetree@vger.kernel.org, linux-serial@vger.kernel.org,
linux-doc@vger.kernel.org, linux-samsung-soc@vger.kernel.org,
linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [RFT PATCH v3 22/27] tty: serial: samsung_tty: Use devm_ioremap_resource
Date: Fri, 5 Mar 2021 06:38:57 +0900 [thread overview]
Message-ID: <20210304213902.83903-23-marcan@marcan.st> (raw)
In-Reply-To: <20210304213902.83903-1-marcan@marcan.st>
This picks up the non-posted I/O mode needed for Apple platforms to
work properly.
This removes the request/release functions, which are no longer
necessary, since devm_ioremap_resource takes care of that already. Most
other drivers already do it this way, anyway.
Signed-off-by: Hector Martin <marcan@marcan.st>
---
drivers/tty/serial/samsung_tty.c | 25 +++----------------------
1 file changed, 3 insertions(+), 22 deletions(-)
diff --git a/drivers/tty/serial/samsung_tty.c b/drivers/tty/serial/samsung_tty.c
index 7106eb238d8c..26cb05992e9f 100644
--- a/drivers/tty/serial/samsung_tty.c
+++ b/drivers/tty/serial/samsung_tty.c
@@ -1573,26 +1573,11 @@ static const char *s3c24xx_serial_type(struct uart_port *port)
}
}
-#define MAP_SIZE (0x100)
-
-static void s3c24xx_serial_release_port(struct uart_port *port)
-{
- release_mem_region(port->mapbase, MAP_SIZE);
-}
-
-static int s3c24xx_serial_request_port(struct uart_port *port)
-{
- const char *name = s3c24xx_serial_portname(port);
-
- return request_mem_region(port->mapbase, MAP_SIZE, name) ? 0 : -EBUSY;
-}
-
static void s3c24xx_serial_config_port(struct uart_port *port, int flags)
{
struct s3c24xx_uart_info *info = s3c24xx_port_to_info(port);
- if (flags & UART_CONFIG_TYPE &&
- s3c24xx_serial_request_port(port) == 0)
+ if (flags & UART_CONFIG_TYPE)
port->type = info->port_type;
}
@@ -1645,8 +1630,6 @@ static const struct uart_ops s3c24xx_serial_ops = {
.shutdown = s3c24xx_serial_shutdown,
.set_termios = s3c24xx_serial_set_termios,
.type = s3c24xx_serial_type,
- .release_port = s3c24xx_serial_release_port,
- .request_port = s3c24xx_serial_request_port,
.config_port = s3c24xx_serial_config_port,
.verify_port = s3c24xx_serial_verify_port,
#if defined(CONFIG_SERIAL_SAMSUNG_CONSOLE) && defined(CONFIG_CONSOLE_POLL)
@@ -1668,8 +1651,6 @@ static const struct uart_ops s3c64xx_serial_ops = {
.shutdown = s3c64xx_serial_shutdown,
.set_termios = s3c24xx_serial_set_termios,
.type = s3c24xx_serial_type,
- .release_port = s3c24xx_serial_release_port,
- .request_port = s3c24xx_serial_request_port,
.config_port = s3c24xx_serial_config_port,
.verify_port = s3c24xx_serial_verify_port,
#if defined(CONFIG_SERIAL_SAMSUNG_CONSOLE) && defined(CONFIG_CONSOLE_POLL)
@@ -1927,8 +1908,8 @@ static int s3c24xx_serial_init_port(struct s3c24xx_uart_port *ourport,
dev_dbg(port->dev, "resource %pR)\n", res);
- port->membase = devm_ioremap(port->dev, res->start, resource_size(res));
- if (!port->membase) {
+ port->membase = devm_ioremap_resource(port->dev, res);
+ if (IS_ERR(port->membase)) {
dev_err(port->dev, "failed to remap controller address\n");
return -EBUSY;
}
--
2.30.0
next prev parent reply other threads:[~2021-03-04 21:44 UTC|newest]
Thread overview: 136+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-04 21:38 [RFT PATCH v3 00/27] Apple M1 SoC platform bring-up Hector Martin
2021-03-04 21:38 ` [RFT PATCH v3 01/27] arm64: Cope with CPUs stuck in VHE mode Hector Martin
2021-03-24 18:05 ` Will Deacon
2021-03-24 20:00 ` Marc Zyngier
2021-03-26 7:54 ` Hector Martin
2021-03-04 21:38 ` [RFT PATCH v3 02/27] dt-bindings: vendor-prefixes: Add apple prefix Hector Martin
2021-03-08 20:26 ` Rob Herring
2021-03-04 21:38 ` [RFT PATCH v3 03/27] dt-bindings: arm: apple: Add bindings for Apple ARM platforms Hector Martin
2021-03-05 10:16 ` Linus Walleij
2021-03-08 20:27 ` Rob Herring
2021-03-04 21:38 ` [RFT PATCH v3 04/27] dt-bindings: arm: cpus: Add apple,firestorm & icestorm compatibles Hector Martin
2021-03-08 20:27 ` Rob Herring
2021-03-04 21:38 ` [RFT PATCH v3 05/27] arm64: cputype: Add CPU implementor & types for the Apple M1 cores Hector Martin
2021-03-24 18:13 ` Will Deacon
2021-03-04 21:38 ` [RFT PATCH v3 06/27] dt-bindings: timer: arm,arch_timer: Add interrupt-names support Hector Martin
2021-03-05 10:18 ` Linus Walleij
2021-03-08 11:12 ` Marc Zyngier
2021-03-08 17:14 ` Tony Lindgren
2021-03-08 20:38 ` Rob Herring
2021-03-08 22:42 ` Marc Zyngier
2021-03-09 16:11 ` Rob Herring
2021-03-09 20:28 ` Hector Martin
2021-03-04 21:38 ` [RFT PATCH v3 07/27] arm64: arch_timer: implement support for interrupt-names Hector Martin
2021-03-05 10:19 ` Linus Walleij
2021-03-08 11:13 ` Marc Zyngier
2021-03-04 21:38 ` [RFT PATCH v3 08/27] asm-generic/io.h: Add a non-posted variant of ioremap() Hector Martin
2021-03-05 14:45 ` Andy Shevchenko
2021-03-05 15:19 ` Hector Martin
2021-03-08 11:20 ` Marc Zyngier
2021-03-24 18:12 ` Will Deacon
2021-03-24 19:09 ` Arnd Bergmann
2021-03-25 14:07 ` Hector Martin
2021-03-25 14:49 ` Will Deacon
2021-03-04 21:38 ` [RFT PATCH v3 09/27] docs: driver-api: device-io: Document I/O access functions Hector Martin
2021-03-05 10:22 ` Linus Walleij
2021-03-04 21:38 ` [RFT PATCH v3 10/27] docs: driver-api: device-io: Document ioremap() variants & access funcs Hector Martin
2021-03-05 10:25 ` Linus Walleij
2021-03-05 15:09 ` Andy Shevchenko
2021-03-05 15:51 ` Arnd Bergmann
2021-03-09 20:29 ` Hector Martin
2021-03-04 21:38 ` [RFT PATCH v3 11/27] arm64: Implement ioremap_np() to map MMIO as nGnRnE Hector Martin
2021-03-08 11:22 ` Marc Zyngier
2021-03-24 18:18 ` Will Deacon
2021-03-04 21:38 ` [RFT PATCH v3 12/27] of/address: Add infrastructure to declare MMIO as non-posted Hector Martin
2021-03-05 10:28 ` Linus Walleij
2021-03-05 15:13 ` Andy Shevchenko
2021-03-05 15:55 ` Hector Martin
2021-03-05 16:08 ` Andy Shevchenko
2021-03-05 16:43 ` Arnd Bergmann
2021-03-05 17:19 ` Hector Martin
2021-03-05 16:05 ` Rob Herring
2021-03-05 17:39 ` Rob Herring
2021-03-05 18:18 ` Hector Martin
2021-03-05 21:17 ` Arnd Bergmann
2021-03-08 15:56 ` Rob Herring
2021-03-08 20:29 ` Arnd Bergmann
2021-03-08 21:13 ` Rob Herring
2021-03-08 21:56 ` Arnd Bergmann
2021-03-09 15:48 ` Rob Herring
2021-03-09 20:23 ` Hector Martin
2021-03-09 22:06 ` Rob Herring
2021-03-10 8:26 ` Hector Martin
2021-03-10 17:01 ` Rob Herring
2021-03-11 9:12 ` Arnd Bergmann
2021-03-11 12:11 ` Hector Martin
2021-03-11 13:35 ` Arnd Bergmann
2021-03-11 16:07 ` Rob Herring
2021-03-11 16:48 ` Arnd Bergmann
2021-03-11 18:10 ` Rob Herring
2021-03-12 10:20 ` Arnd Bergmann
2021-03-09 11:14 ` Linus Walleij
2021-03-09 12:41 ` Arnd Bergmann
2021-03-09 15:40 ` Linus Walleij
2021-03-04 21:38 ` [RFT PATCH v3 13/27] arm64: Add Apple vendor-specific system registers Hector Martin
2021-03-24 18:38 ` Will Deacon
2021-03-24 18:59 ` Mark Rutland
2021-03-24 19:04 ` Will Deacon
2021-03-26 6:23 ` Hector Martin
2021-03-04 21:38 ` [RFT PATCH v3 14/27] arm64: move ICH_ sysreg bits from arm-gic-v3.h to sysreg.h Hector Martin
2021-03-08 11:39 ` Marc Zyngier
2021-03-24 18:23 ` Will Deacon
2021-03-04 21:38 ` [RFT PATCH v3 15/27] dt-bindings: interrupt-controller: Add DT bindings for apple-aic Hector Martin
2021-03-08 21:16 ` Rob Herring
2021-03-04 21:38 ` [RFT PATCH v3 16/27] irqchip/apple-aic: Add support for the Apple Interrupt Controller Hector Martin
2021-03-05 15:05 ` Andy Shevchenko
2021-03-08 11:50 ` Marc Zyngier
2021-03-08 12:02 ` Andy Shevchenko
2021-03-26 13:40 ` Hector Martin
2021-03-08 13:31 ` Marc Zyngier
2021-03-26 7:57 ` Hector Martin
2021-03-24 19:57 ` Will Deacon
2021-03-26 8:58 ` Hector Martin
2021-03-29 12:04 ` Will Deacon
2021-04-01 13:16 ` Hector Martin
2021-03-04 21:38 ` [RFT PATCH v3 17/27] arm64: Kconfig: Introduce CONFIG_ARCH_APPLE Hector Martin
2021-03-08 15:35 ` Marc Zyngier
2021-03-09 20:30 ` Hector Martin
2021-03-04 21:38 ` [RFT PATCH v3 18/27] tty: serial: samsung_tty: Separate S3C64XX ops structure Hector Martin
2021-03-05 10:30 ` Krzysztof Kozlowski
2021-03-04 21:38 ` [RFT PATCH v3 19/27] tty: serial: samsung_tty: Add ucon_mask parameter Hector Martin
2021-03-05 10:34 ` Krzysztof Kozlowski
2021-03-04 21:38 ` [RFT PATCH v3 20/27] tty: serial: samsung_tty: Add s3c24xx_port_type Hector Martin
2021-03-05 10:49 ` Krzysztof Kozlowski
2021-03-04 21:38 ` [RFT PATCH v3 21/27] tty: serial: samsung_tty: IRQ rework Hector Martin
2021-03-05 10:51 ` Krzysztof Kozlowski
2021-03-05 15:17 ` Andy Shevchenko
2021-03-05 16:16 ` Hector Martin
2021-03-05 16:20 ` Andy Shevchenko
2021-03-05 16:29 ` Hector Martin
2021-03-07 11:34 ` Krzysztof Kozlowski
2021-03-07 16:01 ` Arnd Bergmann
2021-03-07 19:51 ` Krzysztof Kozlowski
2021-03-04 21:38 ` Hector Martin [this message]
2021-03-05 10:54 ` [RFT PATCH v3 22/27] tty: serial: samsung_tty: Use devm_ioremap_resource Krzysztof Kozlowski
2021-03-05 15:19 ` Andy Shevchenko
2021-03-04 21:38 ` [RFT PATCH v3 23/27] dt-bindings: serial: samsung: Add apple,s5l-uart compatible Hector Martin
2021-03-08 21:17 ` Rob Herring
2021-03-04 21:38 ` [RFT PATCH v3 24/27] tty: serial: samsung_tty: Add support for Apple UARTs Hector Martin
2021-03-05 10:58 ` Krzysztof Kozlowski
2021-03-05 15:28 ` Andy Shevchenko
2021-03-05 17:04 ` Hector Martin
2021-03-07 11:40 ` Krzysztof Kozlowski
2021-03-04 21:39 ` [RFT PATCH v3 25/27] tty: serial: samsung_tty: Add earlycon " Hector Martin
2021-03-05 10:55 ` Krzysztof Kozlowski
2021-03-10 23:11 ` Linus Walleij
2021-03-04 21:39 ` [RFT PATCH v3 26/27] dt-bindings: display: Add apple,simple-framebuffer Hector Martin
2021-03-08 21:18 ` Rob Herring
2021-03-09 16:37 ` Linus Walleij
2021-03-09 20:35 ` Hector Martin
2021-03-04 21:39 ` [RFT PATCH v3 27/27] arm64: apple: Add initial Apple Mac mini (M1, 2020) devicetree Hector Martin
2021-03-05 11:03 ` Krzysztof Kozlowski
2021-03-05 11:14 ` Hector Martin
2021-03-05 11:45 ` Krzysztof Kozlowski
2021-03-05 15:59 ` Mark Kettenis
2021-03-05 16:50 ` Hector Martin
2021-03-05 10:11 ` [RFT PATCH v3 00/27] Apple M1 SoC platform bring-up Hector Martin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210304213902.83903-23-marcan@marcan.st \
--to=marcan@marcan.st \
--cc=andy.shevchenko@gmail.com \
--cc=arnd@kernel.org \
--cc=catalin.marinas@arm.com \
--cc=corbet@lwn.net \
--cc=davem@davemloft.net \
--cc=devicetree@vger.kernel.org \
--cc=graf@amazon.com \
--cc=gregkh@linuxfoundation.org \
--cc=hch@infradead.org \
--cc=krzk@kernel.org \
--cc=linus.walleij@linaro.org \
--cc=linux-arch@vger.kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-samsung-soc@vger.kernel.org \
--cc=linux-serial@vger.kernel.org \
--cc=mark.kettenis@xs4all.nl \
--cc=mark.rutland@arm.com \
--cc=maz@kernel.org \
--cc=mohamed.mediouni@caramail.com \
--cc=olof@lixom.net \
--cc=robh@kernel.org \
--cc=stan@corellium.com \
--cc=tony@atomide.com \
--cc=will@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).